Merge pull request #454 from fschmenger/fix_typo_DragDop

Fix typo drag dop

Author: fschmenger

app-starter/public/static/app-conf-sidebar.json

@@ -22,8 +22,8 @@
 
   "mapZoom": 2,
   "mapCenter": [0, 0],
-  "mapGeodataDragDop": {
-    "formats": ["GeoJSON", "KML"],
+  "mapGeodataDragDrop": {
+    "formats": ["GeoJSON","KML"],
     "zoomToData": true,
     "replaceData": true,
     "displayInLayerList": true

app-starter/public/static/app-conf.json

@@ -22,7 +22,7 @@
 
   "mapZoom": 2,
   "mapCenter": [0, 0],
-  "mapGeodataDragDop": {
+  "mapGeodataDragDrop": {
     "formats": ["GeoJSON", "KML"],
     "zoomToData": true,
     "replaceData": true,

docs/wegue-configuration.md

@@ -18,7 +18,7 @@ This describes the Wegue application configuration, which is modelled as JSON do
 | **mapZoom**        | Initial zoom level of the map | `"mapZoom": 2` |
 | **mapCenter**      | Initial center of the map in map projection | `"mapCenter": [0, 0]` |
 | mapProjection      | Configuration object for CRS / projection used for the map | see [mapProjection](wegue-configuration?id=mapprojection) |
-| mapGeodataDragDop  | Configuration object for geodata file drag/drop functionality on the map. Only by setting the config this function will be enabled. | see [mapGeodataDragDop](wegue-configuration?id=mapGeodataDragDop) |
+| mapGeodataDragDrop  | Configuration object for geodata file drag/drop functionality on the map. Only by setting the config this function will be enabled. | see [mapGeodataDragDrop](wegue-configuration?id=mapGeodataDragDrop) |
 | mapHover           | Configuration object containing application wide parameters for hover tooltips on the map. | see [mapHover](wegue-configuration?id=mapHover)
 | **modules**        | Array of module configuration objects | See [modules](module-configuration) |
 | **mapLayers**      | Array of map layer configuration objects | See [mapLayers](map-layer-configuration) |
@@ -207,9 +207,9 @@ In a Layer configuration a specific tilegrid can be refered to as follows, using
     }
 ```
 
-### mapGeodataDragDop
+### mapGeodataDragDrop
 
-Setting the property `mapGeodataDragDop` in the main Wegue configuration will enable geodata file drag/drop functionality on the map.
+Setting the property `mapGeodataDragDrop` in the main Wegue configuration will enable geodata file drag/drop functionality on the map.
 
 The following configurations can be set:
 
@@ -440,7 +440,7 @@ Example configurations can be found in the `app-starter/static` directory. Below
 
   "mapZoom": 2,
   "mapCenter": [0, 0],
-  "mapGeodataDragDop": {
+  "mapGeodataDragDrop": {
     "formats": ["GeoJSON", "KML"],
     "zoomToData": true,
     "replaceData": true,

src/components/ol/Map.vue

@@ -44,7 +44,7 @@ export default {
       tileGridDefs: this.$appConfig.tileGridDefs || {},
       tileGrids: {},
       permalink: this.$appConfig.permalink,
-      mapGeodataDragDop: this.$appConfig.mapGeodataDragDop,
+      mapGeodataDragDrop: this.$appConfig.mapGeodataDragDrop,
       // mapping format string to OL module / class
       formatMapping: {
         GPX,
@@ -130,7 +130,7 @@ export default {
     });
 
     // add geodata drag-drop support according to config
-    if (this.mapGeodataDragDop) {
+    if (this.mapGeodataDragDrop) {
       const dragAndDropInteraction = this.setupGeodataDragDrop();
       interactions.push(dragAndDropInteraction);
     }
@@ -301,7 +301,7 @@ export default {
      * features in a vector layer
      */
     setupGeodataDragDrop () {
-      const mapDdConf = this.mapGeodataDragDop;
+      const mapDdConf = this.mapGeodataDragDrop;
       const formats = mapDdConf.formats.filter(formatStr => {
         return this.formatMapping[formatStr];
       }).map(fs => {

src/main.js

@@ -112,7 +112,7 @@ const migrateAppConfig = function (appConfig) {
     'browserTitle': 'app.browserTitle',
     'footerTextLeft': 'app.footerTextLeft',
     'footerTextRight': 'app.footerTextRight',
-    'mapGeodataDragDop\\.layerName': 'mapLayers.wgu-drag-drop-layer.name',
+    'mapGeodataDragDrop\\.layerName': 'mapLayers.wgu-drag-drop-layer.name',
     'modules.\\.wgu-attributetable\\.selectorLabel': 'wgu-attributetable.selectorLabel',
     'modules\\.wgu-geocoder\\.placeHolder': 'wgu-geocoder.placeHolder',
     'modules\\.wgu-infoclick\\.mediaInfoLinkText': 'wgu-infoclick.mediaInfoLinkText',
@@ -193,6 +193,12 @@ const migrateAppConfig = function (appConfig) {
     }
   };
 
+  // Warning for deprecated mapGeodataDragDop.
+  if (appConfig.mapGeodataDragDop) {
+    console.warn('The configuration path ".mapGeodataDragDop" is deprecated, ' +
+      'instead declare a path ".mapGeodataDragDrop"');
+  }
+
   return appConfig;
 }
 

tests/unit/specs/components/ol/Map.spec.js

@@ -76,7 +76,7 @@ describe('ol/Map.vue', () => {
       expect(vm.tileGridDefs).to.be.empty;
       expect(vm.tileGrids).to.be.empty;
       expect(vm.permalink).to.be.undefined;
-      expect(vm.mapGeodataDragDop).to.be.undefined;
+      expect(vm.mapGeodataDragDrop).to.be.undefined;
       expect(vm.dragDropLayerCreated).to.be.false;
       expect(vm.formatMapping).to.be.an('object');
       expect(Object.keys(vm.formatMapping)).to.have.lengthOf(5);

upgrade-notes.md

@@ -125,6 +125,10 @@ Even if you used the stock configuration files, as some linting rules were added
 The majority of those can be fixed automatically by running the `npm run lint:fix` command.  
 If you want to momentarily bypass some advanced errors to test your upgraded app or want to adapt linting rules to better suit your preferences, you can modify the `eslint.config.js` file as needed.
 
+### Other Changes
+
+`mapGeodataDragDop` property of the main `Wegue` application configuration was renamed `mapGeodataDragDrop`. Please update your configuration files accordingly.
+
 ## v1 -> v2
 
 ### Vue-CLI