added url opts

wbc/core/context_processors.py

@@ -11,6 +11,7 @@ def settings(request):
         'site_title': django_settings.SITE_TITLE,
         'site_url': django_settings.SITE_URL,
         'tiles_url': django_settings.TILES_URL,
+        'tiles_url_opt': django_settings.TILES_URL_OPT,
         'tiles_opt': django_settings.TILES_OPT,
         'default_view': django_settings.DEFAULT_VIEW,
         'facebook_apikey': facebookapikey

wbc/core/static/adminmap.js

@@ -12,7 +12,7 @@ function drawMap(){
 
     // add the map layer
     map = new L.Map("adminmap");
-    map.addLayer(new L.TileLayer(_tiles_url + '/{z}/{x}/{y}.png',_tiles_opt));
+    map.addLayer(new L.TileLayer(_tiles_url + '/{z}/{x}/{y}.png' + _tiles_url_opt,_tiles_opt));
 
     // get lat and lon from the form fields
     var lat, lon;
@@ -103,4 +103,4 @@ function drawMap(){
 
 $(document).ready(function() {
     setTimeout('drawMap()',100);
-});
+});

wbc/core/static/map.js

@@ -12,7 +12,7 @@ app.factory('MapService',['$http',function($http) {
         'scrollWheelZoom': false
     });
 
-    map.addLayer(new L.TileLayer(_tiles_url + '/{z}/{x}/{y}.png',_tiles_opt));
+    map.addLayer(new L.TileLayer(_tiles_url + '/{z}/{x}/{y}.png' + _tiles_url_opt,_tiles_opt));
     map.setView(new L.LatLng(_default_view.lat,_default_view.lon),_default_view.zoom);
 
     var markerLayer = L.layerGroup().addTo(map);
@@ -193,4 +193,4 @@ app.controller('MapController',['$scope','$document','$window','$timeout','$loca
         $scope.showMap();
     });
 
-}]);
+}]);

wbc/core/static/placemap.js

@@ -1,7 +1,7 @@
 function initMap() {
     // add the map layer and center map
     map = new L.Map("place-map",{scrollWheelZoom: false});
-    map.addLayer(new L.TileLayer(_tiles_url + '/{z}/{x}/{y}.png',_tiles_opt));
+    map.addLayer(new L.TileLayer(_tiles_url + '/{z}/{x}/{y}.png' + _tiles_url_opt,_tiles_opt));
     map.setView(new L.LatLng(_lat, _lon), 15);
 
     var osmb = new OSMBuildings(map).loadData();

wbc/core/templates/core/map.html

@@ -12,6 +12,7 @@
     <script type="text/javascript">
         var _static_url = {% static '' %}
         var _tiles_url = "{{tiles_url}}";
+        var _tiles_url_opt = "{{tiles_url_opt}}";
         var _tiles_opt = {{tiles_opt|safe}};
         var _default_view = {{default_view|safe}};
     </script>

wbc/process/templates/process/admin/change_form.html

@@ -11,6 +11,7 @@
     <script type="text/javascript">
         var _static_url = '{% static '' %}';
         var _tiles_url = "{{tiles_url}}";
+        var _tiles_url_opt = "{{tiles_url_opt}}";
         var _tiles_opt = {{tiles_opt|safe}};
         var _default_view = {{default_view|safe}};
     </script>

wbc/process/templates/process/place.html

@@ -12,6 +12,7 @@
     <script type="text/javascript">
         var _static_url = {% static '' %}
         var _tiles_url = "{{tiles_url}}";
+        var _tiles_url_opt = "{{tiles_url_opt}}";
         var _tiles_opt = {{tiles_opt|safe}};
         var _default_view = {{default_view|safe}};
 

wbc/process/templates/process/place_form.html

@@ -14,6 +14,7 @@
     <script type="text/javascript">
         var _static_url = '{% static '' %}';
         var _tiles_url = "{{tiles_url}}";
+        var _tiles_url_opt = "{{tiles_url_opt}}";
         var _tiles_opt = {{tiles_opt|safe}};
         var _default_view = {{default_view|safe}};
     </script>