1473 configurable basemaps

docker/django/run.sh

@@ -51,6 +51,13 @@ for i do # loop over $@
         python manage.py migrate --noinput
         echo '    load initial data'
         python manage.py loaddata --app mapstory initial_data
+        if [ "$GEOINT_SERVICES" ]; then
+            echo '    load initial geoint baselayers'
+            python manage.py loaddata --app mapstory initial_baselayers_geoint
+        else
+            echo '    load initial geoint baselayers'
+            python manage.py loaddata --app mapstory initial_baselayers
+        fi
         echo '    set initial user id at 1000'
         python manage.py loaddata --app mapstory initial_user_id
         echo '    create admin user'

mapstory/admin.py

@@ -6,7 +6,8 @@
 from geonode.people.admin import ProfileAdmin as UserAdmin
 from mapstory.export import export_via_model
 from mapstory.flag import admin as flag_admin
-from mapstory.models import (CustomSite, GetPage, GetPageContent, Leader,
+from mapstory.models import (Baselayer, CustomSite, DefaultBaselayer,
+                             GetPage, GetPageContent, Leader,
                              MapStory, NewsItem, ParallaxImage, Sponsor)
 
 
@@ -157,6 +158,17 @@ class ExtendedLayerAdmin(LayerAdmin):
     list_filter = ('featured', )
 
 
+class BaselayerAdmin(admin.ModelAdmin):
+    model = Baselayer
+
+
+class DefaultBaselayerAdmin(admin.ModelAdmin):
+    class Meta:
+        verbose_name = 'Default Baselayer'
+        verbose_name_plural = 'Default Baselayer'
+    model = DefaultBaselayer
+
+
 admin.site.unregister(Layer)
 admin.site.register(Layer, ExtendedLayerAdmin)
 admin.site.register(MapStory, MapStoryAdmin)
@@ -167,3 +179,5 @@ class ExtendedLayerAdmin(LayerAdmin):
 admin.site.register(Leader, LeaderAdmin)
 admin.site.register(ParallaxImage, ParallaxImageAdmin)
 admin.site.register(CustomSite, CustomSiteAdmin)
+admin.site.register(Baselayer, BaselayerAdmin)
+admin.site.register(DefaultBaselayer, DefaultBaselayerAdmin)

mapstory/fixtures/initial_baselayers.json

@@ -0,0 +1,262 @@
+[
+  {
+    "fields": {
+      "opacity": "1.00",
+      "group": "",
+      "name": "",
+      "title": "",
+      "source_hidden": false,
+      "is_virtual_service": false,
+      "args": "",
+      "visibility": true,
+      "source_url": "${OGC_SERVER}wms",
+      "source_rest_url": "/gs/rest",
+      "source_ptype": "gxp_wmscsource",
+      "proj": "EPSG:4326",
+      "always_anonymous": false,
+      "source_name": "local geoserver",
+      "fixed": false,
+      "type": "",
+      "source_lazy": true
+    },
+    "model": "mapstory.baselayer",
+    "pk": 1
+  },
+  {
+    "fields": {
+      "opacity": "1.00",
+      "group": "background",
+      "name": "",
+      "title": "",
+      "source_hidden": false,
+      "is_virtual_service": false,
+      "args": "[\"No background\"]",
+      "visibility": false,
+      "source_url": "",
+      "source_rest_url": "",
+      "source_ptype": "gxp_olsource",
+      "proj": "EPSG:4326",
+      "always_anonymous": false,
+      "source_name": "",
+      "fixed": true,
+      "type": "OpenLayers.Layer",
+      "source_lazy": false
+    },
+    "model": "mapstory.baselayer",
+    "pk": 2
+  },
+  {
+    "fields": {
+      "opacity": "1.00",
+      "group": "background",
+      "name": "mapnik",
+      "title": "",
+      "source_hidden": false,
+      "is_virtual_service": false,
+      "args": "[\"OpenStreetMap\"]",
+      "visibility": false,
+      "source_url": "",
+      "source_rest_url": "",
+      "source_ptype": "gxp_osmsource",
+      "proj": "EPSG:4326",
+      "always_anonymous": false,
+      "source_name": "",
+      "fixed": true,
+      "type": "OpenLayers.Layer.OSM",
+      "source_lazy": false
+    },
+    "model": "mapstory.baselayer",
+    "pk": 3
+  },
+  {
+    "fields": {
+      "opacity": "1.00",
+      "group": "background",
+      "name": "hot",
+      "title": "Humanitarian OpenStreetMap",
+      "source_hidden": false,
+      "is_virtual_service": false,
+      "args": "[\"Humanitarian OpenStreetMap\", [\"//a.tile.openstreetmap.fr/hot/${z}/${x}/${y}.png\",\"//b.tile.openstreetmap.fr/hot/${z}/${x}/${y}.png\",\"//c.tile.openstreetmap.fr/hot/${z}/${x}/${y}.png\"], {\"tileOptions\": {\"crossOriginKeyword\": None}}]",
+      "visibility": false,
+      "source_url": "",
+      "source_rest_url": "",
+      "source_ptype": "gxp_osmsource",
+      "proj": "EPSG:4326",
+      "always_anonymous": false,
+      "source_name": "",
+      "fixed": true,
+      "type": "OpenLayers.Layer.OSM",
+      "source_lazy": false
+    },
+    "model": "mapstory.baselayer",
+    "pk": 4
+  },
+  {
+    "fields": {
+      "opacity": "1.00",
+      "group": "background",
+      "name": "",
+      "title": "",
+      "source_hidden": false,
+      "is_virtual_service": false,
+      "args": "[\"Naked Earth\",\"//maps.opengeo.org/geowebcache/service/wms\",{\"layers\": [\"Wayne\"],\"format\": \"image/png\",\"tiled\": True,\"tilesOrigin\": [-20037508.34, -20037508.34]},{\"buffer\": 0}]",
+      "visibility": false,
+      "source_url": "",
+      "source_rest_url": "",
+      "source_ptype": "gxp_olsource",
+      "proj": "EPSG:4326",
+      "always_anonymous": false,
+      "source_name": "",
+      "fixed": true,
+      "type": "OpenLayers.Layer.WMS",
+      "source_lazy": false
+    },
+    "model": "mapstory.baselayer",
+    "pk": 5
+  },
+  {
+    "fields": {
+      "opacity": "1.00",
+      "group": "background",
+      "name": "natural-earth-1",
+      "title": "Natural Earth",
+      "source_hidden": true,
+      "is_virtual_service": false,
+      "args": "",
+      "visibility": true,
+      "source_url": "",
+      "source_rest_url": "",
+      "source_ptype": "gxp_mapboxsource",
+      "proj": "EPSG:4326",
+      "always_anonymous": false,
+      "source_name": "",
+      "fixed": false,
+      "type": "",
+      "source_lazy": false
+    },
+    "model": "mapstory.baselayer",
+    "pk": 6
+  },
+  {
+    "fields": {
+      "opacity": "1.00",
+      "group": "background",
+      "name": "natural-earth-2",
+      "title": "Natural Earth 2",
+      "source_hidden": true,
+      "is_virtual_service": false,
+      "args": "",
+      "visibility": false,
+      "source_url": "",
+      "source_rest_url": "",
+      "source_ptype": "gxp_mapboxsource",
+      "proj": "EPSG:4326",
+      "always_anonymous": false,
+      "source_name": "",
+      "fixed": false,
+      "type": "Natural Earth 2",
+      "source_lazy": false
+    },
+    "model": "mapstory.baselayer",
+    "pk": 7
+  },
+  {
+    "fields": {
+      "opacity": "1.00",
+      "group": "background",
+      "name": "control-room",
+      "title": "MapBoxControlRoom",
+      "source_hidden": true,
+      "is_virtual_service": false,
+      "args": "",
+      "visibility": false,
+      "source_url": "",
+      "source_rest_url": "",
+      "source_ptype": "gxp_mapboxsource",
+      "proj": "EPSG:4326",
+      "always_anonymous": false,
+      "source_name": "",
+      "fixed": false,
+      "type": "",
+      "source_lazy": false
+    },
+    "model": "mapstory.baselayer",
+    "pk": 8
+  },
+  {
+    "fields": {
+      "opacity": "1.00",
+      "group": "background",
+      "name": "geography-class",
+      "title": "Geography Class",
+      "source_hidden": true,
+      "is_virtual_service": false,
+      "args": "",
+      "visibility": false,
+      "source_url": "",
+      "source_rest_url": "",
+      "source_ptype": "gxp_mapboxsource",
+      "proj": "EPSG:4326",
+      "always_anonymous": false,
+      "source_name": "",
+      "fixed": false,
+      "type": "",
+      "source_lazy": false
+    },
+    "model": "mapstory.baselayer",
+    "pk": 9
+  },
+  {
+    "fields": {
+      "opacity": "1.00",
+      "group": "background",
+      "name": "world-dark",
+      "title": "World Dark",
+      "source_hidden": true,
+      "is_virtual_service": false,
+      "args": "",
+      "visibility": true,
+      "source_url": "",
+      "source_rest_url": "",
+      "source_ptype": "gxp_mapboxsource",
+      "proj": "EPSG:4326",
+      "always_anonymous": false,
+      "source_name": "",
+      "fixed": false,
+      "type": "",
+      "source_lazy": false
+    },
+    "model": "mapstory.baselayer",
+    "pk": 10
+  },
+  {
+    "fields": {
+      "opacity": "1.00",
+      "group": "background",
+      "name": "world-light",
+      "title": "World Light",
+      "source_hidden": true,
+      "is_virtual_service": false,
+      "args": "",
+      "visibility": true,
+      "source_url": "",
+      "source_rest_url": "",
+      "source_ptype": "gxp_mapboxsource",
+      "proj": "EPSG:4326",
+      "always_anonymous": false,
+      "source_name": "",
+      "fixed": false,
+      "type": "",
+      "source_lazy": false
+    },
+    "model": "mapstory.baselayer",
+    "pk": 11
+  },
+  {
+    "fields": {
+      "layer": 10
+    },
+    "model": "mapstory.defaultbaselayer",
+    "pk": 1
+  }
+]

mapstory/fixtures/initial_baselayers_geoint.json

@@ -0,0 +1,55 @@
+[
+  {
+    "fields": {
+      "opacity": "1.00",
+      "group": "",
+      "name": "",
+      "title": "",
+      "source_hidden": false,
+      "is_virtual_service": false,
+      "args": "",
+      "visibility": true,
+      "source_url": "${OGC_SERVER}wms",
+      "source_rest_url": "/gs/rest",
+      "source_ptype": "gxp_wmscsource",
+      "proj": "EPSG:4326",
+      "always_anonymous": false,
+      "source_name": "local geoserver",
+      "fixed": false,
+      "type": "",
+      "source_lazy": true
+    },
+    "model": "mapstory.baselayer",
+    "pk": 1
+  },
+  {
+    "fields": {
+      "opacity": "1.00",
+      "group": "background",
+      "name": "geoint-services-osm",
+      "title": "GEOINT Services OpenStreetMap",
+      "source_hidden": false,
+      "is_virtual_service": false,
+      "args": "[\"GEOINT Services OpenStreetMap\", [\"//osm.gs.mil/tiles/default/{z}/{x}/{y}.png\"], {\"tileOptions\": {\"crossOriginKeyword\": None}}]",
+      "visibility": true,
+      "source_url": "",
+      "source_rest_url": "",
+      "source_ptype": "gxp_osmsource",
+      "proj": "EPSG:4326",
+      "always_anonymous": false,
+      "source_name": "",
+      "fixed": true,
+      "type": "OpenLayers.Layer.OSM",
+      "source_lazy": false
+    },
+    "model": "mapstory.baselayer",
+    "pk": 2
+  },
+  {
+    "fields": {
+      "layer": 1
+    },
+    "model": "mapstory.defaultbaselayer",
+    "pk": 1
+  }
+]