Merge pull request #12 from kshetline/development

Fix spurious view dragging. Dependency updates, updated GRS.

Author: kshetline

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "svc-ng",
-  "version": "1.12.1",
+  "version": "1.12.2",
   "license": "MIT AND GPL-3.0-or-later",
   "author": "Kerry Shetline <kerry@shetline.com>",
   "scripts": {
@@ -14,52 +14,52 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^11.2.3",
-    "@angular/cdk": "^11.2.2",
-    "@angular/common": "^11.2.3",
-    "@angular/compiler": "^11.2.3",
-    "@angular/core": "^11.2.3",
+    "@angular/animations": "^11.2.10",
+    "@angular/cdk": "^11.2.9",
+    "@angular/common": "^11.2.10",
+    "@angular/compiler": "^11.2.10",
+    "@angular/core": "^11.2.10",
     "@angular/flex-layout": "^11.0.0-beta.33",
-    "@angular/forms": "^11.2.3",
-    "@angular/platform-browser": "^11.2.3",
-    "@angular/platform-browser-dynamic": "^11.2.3",
-    "@angular/router": "^11.2.3",
-    "@fortawesome/fontawesome-free": "^5.15.2",
-    "@tubular/astronomy": "^2.1.8",
+    "@angular/forms": "^11.2.10",
+    "@angular/platform-browser": "^11.2.10",
+    "@angular/platform-browser-dynamic": "^11.2.10",
+    "@angular/router": "^11.2.10",
+    "@fortawesome/fontawesome-free": "^5.15.3",
+    "@tubular/astronomy": "^2.2.1",
     "@tubular/math": "^2.2.0",
-    "@tubular/time": "^2.4.2",
-    "@tubular/util": "^3.4.1",
+    "@tubular/time": "^2.6.0",
+    "@tubular/util": "^3.6.0",
     "array-buffer-reader": "^1.0.4",
     "core-js": "^2.6.12",
     "detect-resize": "^0.1.5",
     "lodash-es": "^4.17.21",
     "ng-busy": "^11.0.0",
     "primeicons": "^4.1.0",
-    "primeng": "^11.2.3",
-    "rxjs": "^6.6.6",
+    "primeng": "^11.3.2",
+    "rxjs": "^6.6.7",
     "zone.js": "~0.10.2"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^0.1102.2",
-    "@angular/cli": "^11.2.2",
-    "@angular/compiler-cli": "^11.2.3",
-    "@angular/language-service": "^11.2.3",
+    "@angular-devkit/build-angular": "^0.1102.9",
+    "@angular/cli": "^11.2.9",
+    "@angular/compiler-cli": "^11.2.10",
+    "@angular/language-service": "^11.2.10",
     "@types/googlemaps": "^3.43.2",
-    "@types/jasmine": "~3.6.0",
+    "@types/jasmine": "^3.6.9",
     "@types/jasminewd2": "^2.0.8",
     "@types/lodash-es": "^4.17.4",
-    "@typescript-eslint/eslint-plugin": "^4.16.1",
-    "@typescript-eslint/parser": "^4.16.1",
+    "@typescript-eslint/eslint-plugin": "^4.22.0",
+    "@typescript-eslint/parser": "^4.22.0",
     "codelyzer": "^6.0.0",
-    "eslint": "^7.21.0",
+    "eslint": "^7.24.0",
     "eslint-config-standard": "^16.0.2",
     "eslint-plugin-import": "^2.22.1",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^4.2.1",
     "eslint-plugin-standard": "^5.0.0",
     "jasmine-core": "~3.6.0",
     "jasmine-spec-reporter": "~5.0.0",
-    "karma": "~6.1.1",
+    "karma": "^6.1.2",
     "karma-chrome-launcher": "~3.1.0",
     "karma-coverage-istanbul-reporter": "~3.0.2",
     "karma-jasmine": "~4.0.0",

package.json

@@ -4,7 +4,7 @@
   <div class="about-dialog">
     <img src="/assets/resources/svc_lunar_eclipse.png" alt="lunar eclipse" width="64" height="64">
     <h2>Sky View Café NP</h2>
-    Version 1.12.1<br><br>
+    Version 1.12.2<br><br>
     Copyright © 2016-2021 Kerry Shetline.
   </div>
 </p-dialog>

src/app/app.component.html

@@ -2,9 +2,9 @@ import { AfterViewInit, Directive, ElementRef, ViewChild } from '@angular/core';
 import { SafeStyle } from '@angular/platform-browser';
 import {
   ASTEROID_BASE, COMET_BASE, EARTH, FIRST_PLANET, HALF_MINUTE, ISkyObserver, LAST_PLANET, NO_MATCH, SkyObserver, SolarSystem,
-  StarCatalog, UT_to_TDB
+  StarCatalog
 } from '@tubular/astronomy';
-import { DateTime } from '@tubular/time';
+import { DateTime, utToTdt } from '@tubular/time';
 import { ceil, max, round, sqrt } from '@tubular/math';
 import { clone, FontMetrics, getFontMetrics, isSafari, isString, padLeft } from '@tubular/util';
 import { debounce, throttle } from 'lodash-es';
@@ -362,7 +362,7 @@ export abstract class GenericViewDirective implements AfterViewInit {
       this.resetCursor();
       this.goodDragStart = false;
     }
-    else if (this.canDrag && button1Down) {
+    else if (this.canDrag && this.goodDragStart && button1Down) {
       this.dragging = true;
       this.cursor = this.sanitizedHandCursor;
     }
@@ -387,6 +387,7 @@ export abstract class GenericViewDirective implements AfterViewInit {
       this.onTouchStart(event);
     else if (event.touches.length === 0) {
       this.dragging = false;
+      this.goodDragStart = false;
       event.preventDefault();
     }
   }
@@ -395,6 +396,7 @@ export abstract class GenericViewDirective implements AfterViewInit {
     this.lastMoveX = event.offsetX;
     this.lastMoveY = event.offsetY;
     this.dragging = false;
+    this.goodDragStart = false;
     this.resetCursor();
   }
 
@@ -437,7 +439,7 @@ export abstract class GenericViewDirective implements AfterViewInit {
     dc.skyObserver = new SkyObserver(this.appService.longitude, this.appService.latitude);
     // Bias time half a minute ahead of the clock time for rounding to the middle of the selected minute.
     dc.jdu = DateTime.julianDay(this.time) + HALF_MINUTE;
-    dc.jde = UT_to_TDB(dc.jdu);
+    dc.jde = utToTdt(dc.jdu);
     dc.inkSaver = GenericViewDirective.printing && this.appService.inkSaver;
 
     this.additionalDrawingSetup(dc);

src/app/svc/generic-view.directive.ts

@@ -3,10 +3,10 @@ import { AfterViewInit, Component, ElementRef, ViewChild } from '@angular/core';
 import {
   AstroEvent, EQ_SOLSTICE_EVENT_BASE, EventFinder, FALL_EQUINOX, FIRST_QUARTER, FULL_MOON, ISkyObserver, JUPITER, LAST_QUARTER, MARS,
   MERCURY, MOON, NEPTUNE, NEW_MOON, PHASE_EVENT_BASE, PLUTO, RISE_EVENT, RISE_SET_EVENT_BASE, SATURN, SET_EVENT, SkyObserver,
-  SPRING_EQUINOX, SUMMER_SOLSTICE, SUN, TRANSIT_EVENT, TWILIGHT_BEGINS, TWILIGHT_ENDS, UNSEEN_ALL_DAY, URANUS, UT_to_TDB, VENUS,
+  SPRING_EQUINOX, SUMMER_SOLSTICE, SUN, TRANSIT_EVENT, TWILIGHT_BEGINS, TWILIGHT_ENDS, UNSEEN_ALL_DAY, URANUS, VENUS,
   VISIBLE_ALL_DAY, WINTER_SOLSTICE
 } from '@tubular/astronomy';
-import { DateAndTime, DateTime, Timezone, YMDDate } from '@tubular/time';
+import { DateAndTime, DateTime, Timezone, utToTdt, YMDDate } from '@tubular/time';
 import { ceil, floor, max, min, round } from '@tubular/math';
 import { isEdge, isFirefox, isIE } from '@tubular/util';
 import { throttle } from 'lodash-es';
@@ -298,7 +298,7 @@ export class SvcCalendarViewComponent implements AfterViewInit {
         const noon = new DateTime({ y: date.y, m: date.m, d: Math.abs(date.d), hrs: 12, min: 0, sec: 0 }, timezone, this.appService.gregorianChangeDate);
 
         date.dayLength = dayLength;
-        date.jdeNoon = UT_to_TDB(DateTime.julianDay(noon.utcTimeMillis));
+        date.jdeNoon = utToTdt(DateTime.julianDay(noon.utcTimeMillis));
         date.text = String(date.d);
         date.otherMonth = (date.m !== this.month);
         date.highlight = (date.m === this.month && date.d === this.wallTime.d);

src/app/svc/svc-calendar-view/svc-calendar-view.component.ts

@@ -1,7 +1,7 @@
 import { AfterViewInit, Component, ElementRef, ViewChild } from '@angular/core';
 import { SafeStyle } from '@angular/platform-browser';
-import { getInsolationColor, MOON, SUN, UT_to_TDB } from '@tubular/astronomy';
-import { DateTime, Timezone } from '@tubular/time';
+import { getInsolationColor, MOON, SUN } from '@tubular/astronomy';
+import { DateTime, Timezone, utToTdt } from '@tubular/time';
 import { floor, FMT_DD, FMT_MINS, min, round } from '@tubular/math';
 import { strokeLine } from '@tubular/util';
 import { AppService, CurrentTab, Location, UserSetting } from '../../app.service';
@@ -319,7 +319,7 @@ export class SvcInsolationViewComponent extends GenericViewDirective implements
       }
 
       const time = new DateTime(DateTime.millisFromJulianDay(jdu), this.dateTime.timezone, this.dateTime.getGregorianChange());
-      const jde = UT_to_TDB(jdu);
+      const jde = utToTdt(jdu);
 
       this.skyColor = getInsolationColor(dc.skyObserver, dc.ss, jdu, false);
       this.moonColor = getInsolationColor(dc.skyObserver, dc.ss, jdu, true, false);

src/app/svc/svc-insolation-view/svc-insolation-view.component.ts

@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
-import { SkyObserver, UT_to_TDB } from '@tubular/astronomy';
-import { DAY_MSEC, DateTime, Timezone } from '@tubular/time';
+import { SkyObserver } from '@tubular/astronomy';
+import { DAY_MSEC, DateTime, Timezone, utToTdt } from '@tubular/time';
 import { Angle, FMT_MINS, mod2, Mode, round, Unit } from '@tubular/math';
 import { padLeft, toDefaultLocaleFixed } from '@tubular/util';
 import { AppService, CurrentTab, Location } from '../../app.service';
@@ -81,7 +81,7 @@ export class SvcTimeViewComponent {
       Unit.DEGREES, Mode.RANGE_LIMIT_NONNEGATIVE).toTimeString(FMT_MINS);
 
     this.formattedJulianDate = padLeft(toDefaultLocaleFixed(jdu, 6, 6), 17, nbsp);
-    this.formattedEphemerisDate = padLeft(toDefaultLocaleFixed(UT_to_TDB(jdu), 6, 6), 17, nbsp);
+    this.formattedEphemerisDate = padLeft(toDefaultLocaleFixed(utToTdt(jdu), 6, 6), 17, nbsp);
     this.formattedDays = padLeft(toDefaultLocaleFixed(this.time / DAY_MSEC, 6, 6), 17, nbsp);
     this.formattedSeconds = padLeft(toDefaultLocaleFixed(this.time / 1000, 0, 0), 17, nbsp);
   }

src/app/svc/svc-time-view/svc-time-view.component.ts

@@ -61,6 +61,8 @@
   <h2 class="header-sans"><a name="history">What's New / Version History</a></h2>
   <div  style="padding-left: 1em; text-indent: -1em">
 
+  <p><b>1.12.2 2021-04-20:</b> Fix spurious view dragging. Dependency updates, updated GRS.</p>
+
   <p><b>1.12.1 2021-03-01:</b> Fix dropdown calendar formatting on Safari.</p>
 
   <p><b>1.12.0 2021-02-23:</b> Add UTC-offset option for timezone selection. Fix side panel help links.</p>