Merge pull request ROGUE-JCTD#179 from BerryDaniel/osm_url#176

Added ability to customize the OSM url
davisc · Dec 24, 2015 · 919155e · 919155e
2 parents 5c91333 + c17480d
commit 919155e
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/src/common/map/MapService.js b/src/common/map/MapService.js
@@ -550,14 +550,25 @@
         });
       } else {
         if (server.ptype === 'gxp_osmsource') {
+          var osmLocal = {
+            attributions: [
+              new ol.Attribution({
+                html: settings.OsmLocalAttribution
+              }),
+              ol.source.OSM.ATTRIBUTION
+            ],
+            crossOrigin: null,
+            url: settings.OsmLocalUrl
+          };
+          var osmSource = (settings.OsmLocalUrl !== 'default') ? osmLocal : '';
           layer = new ol.layer.Tile({
             metadata: {
               serverId: server.id,
               name: minimalConfig.name,
               title: fullConfig.Title
             },
             visible: minimalConfig.visibility,
-            source: new ol.source.OSM()
+            source: new ol.source.OSM(osmSource)
           });
         } else if (server.ptype === 'gxp_bingsource') {
 

diff --git a/src/common/utils/Globals.js b/src/common/utils/Globals.js
@@ -11,7 +11,11 @@ var settings = {
   MGRSPrecision: 10,
   WFSVersion: '1.1.0',
   WMSVersion: '1.1.1',
-  WPSVersion: '1.0.0'
+  WPSVersion: '1.0.0',
+  //Set to OsmLocalUrl to 'default' for default mapnick osm basemap
+  OsmLocalUrl: 'default',
+  //OsmLocalUrl: 'http://{a-c}.tile.opencyclemap.org/cycle/{z}/{x}/{y}.png',
+  OsmLocalAttribution: 'All maps &copy; <a href="http://www.opencyclemap.org/">OpenCycleMap</a>'
 };
 
 var forEachArrayish = function(arrayish, funct) {