adjusted binding of basemap and fixed removal of click listener

conterra · Feb 23, 2021 · b1c36a5 · b1c36a5
1 parent 2c8e6db
commit b1c36a5
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 13 deletions.
diff --git a/src/main/js/bundles/dn_screenshot/ScreenshotControl.js b/src/main/js/bundles/dn_screenshot/ScreenshotControl.js
@@ -96,7 +96,7 @@ class ScreenshotControl{
     }
 
     abortDrawing() {
-        if(this.canvas.onclick) {
+        if(this.canvas?.onclick) {
             this.canvas.style.cursor = "default";
             this.canvas.onclick = null;
         }

diff --git a/src/main/js/bundles/dn_screenshot/ScreenshotUI.vue b/src/main/js/bundles/dn_screenshot/ScreenshotUI.vue
@@ -81,9 +81,9 @@
                         min="0"
                     />
                 </div>
-                <h4 v-if="!basemap">{{ i18n.backgroundTitle }}</h4>
+                <h4 v-if="basemap == undefined">{{ i18n.backgroundTitle }}</h4>
                 <v-checkbox
-                    v-if="!basemap"
+                    v-if="basemap  == undefined"
                     v-model="properties.ignoreBackground"
                     :label="i18n.background"
                     hide-details
@@ -130,7 +130,7 @@
                 captureFullMap: true,
                 possibleFormats: ["png", "jpg"],
                 areaDrawn: false,
-                basemap: false,
+                basemap: undefined,
                 toggle_exclusive: undefined
             };
         },

diff --git a/src/main/js/bundles/dn_screenshot/ScreenshotUIFactory.js b/src/main/js/bundles/dn_screenshot/ScreenshotUIFactory.js
@@ -34,15 +34,11 @@ class ScreenshotUIFactory {
         propertiesToViewBinding.bindTo(props, vm.properties);
         // bind properties and view model
         screenshotToViewBinding.bindTo(this, vm);
+        // bind basemap and vue
+        basemapToViewBinding.bindTo(this.basemap, vm);
 
         // register methods to enable/disable binding
         widget.enableBinding = () => {
-            // bind basemap and vue
-            let temp = {
-                basemap: this.model.map.basemap != undefined
-            }
-            basemapToViewBinding.bindTo(temp, vm);
-
             propertiesToViewBinding.enable().syncToRightNow();
             screenshotToViewBinding.enable().syncToLeftNow();
             basemapToViewBinding.enable().syncToRightNow();
@@ -85,7 +81,9 @@ class ScreenshotUIFactory {
     }
     declareBasemapToVueBinding() {
         return Binding.create()
-            .sync("basemap", ifDefined(), ifDefined());
+            .sync("selectedId" +
+                "" +
+                "", "basemap");
     }
 }
 

diff --git a/src/main/js/bundles/dn_screenshot/manifest.json b/src/main/js/bundles/dn_screenshot/manifest.json
@@ -41,7 +41,8 @@
                 {
                     "name": "model",
                     "providing": "map-widget.MapWidgetModel"
-                }, {
+                },
+                {
                     "name": "layerFactory",
                     "providing": "map-config-api.LayerFactory"
                 },
@@ -118,7 +119,12 @@
                 {
                     "name": "model",
                     "providing": "map-widget.MapWidgetModel"
-                }, {
+                },
+                {
+                    "name": "basemap",
+                    "providing": "map-basemaps-api.BasemapsModel"
+                },
+                {
                     "name": "layerFactory",
                     "providing": "map-config-api.LayerFactory"
                 },