Deleted osmarender from olwidget maps

qgis · Oct 22, 2012 · 6f686dd · 6f686dd
1 parent e17ff54
commit 6f686dd
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/qgis-app/static/olwidget/js/olwidget.js b/qgis-app/static/olwidget/js/olwidget.js
@@ -82,7 +82,9 @@ var olwidget = {
                     ],
                     { numZoomLevels: 19 });
         },
+        // Osmarender has been discontinued in March 2012 !!!
         osmarender: function() {
+            return alert('Osmarender has been discontinued in March 2012 !!! Fix your olwidget configuration.');
             return new OpenLayers.Layer.OSM.Osmarender(
                     'OpenStreetMap (Osmarender)');
         }

diff --git a/qgis-app/users/forms.py b/qgis-app/users/forms.py
@@ -39,7 +39,7 @@ class QgisUserForm(MapModelForm):
   geometry = forms.CharField(label="User location:",
                required=True,
                widget=EditableMap(
-                 options = { 'layers': ['osm.mapnik', 'osm.osmarender'] }
+                 options = { 'layers': ['osm.mapnik'] }
                ),
                help_text="To add your location: click 'Edit' on the top-right corner of the map, and then the pencil icon",
                error_messages={'required':

diff --git a/qgis-app/users/templates/user_base.html b/qgis-app/users/templates/user_base.html
@@ -13,9 +13,9 @@
         <div>
             <h3>{% trans "QGIS Users Map" %}</h3>
             <ul class="menu">
-              <li><a href="/community-map/view_users.html">{% trans "Community map"%}</a></li>
-              <li><a href="/community-map/create_user_form.html">{% trans "Add yourself!"%}</a></li>
-              <li><a href="/community-map/update_user.html">{% trans "Update your details"%}</a></li>
+              <li><a href="{% url show_map %}">{% trans "Community map"%}</a></li>
+              <li><a href="{% url create_user %}">{% trans "Add yourself!"%}</a></li>
+              <li><a href="{% url email_update_user_link %}">{% trans "Update your details"%}</a></li>
             </ul>
             <p class="centered">{{ myUserCount }} {% trans "users mapped" %}</p>
         </div>