Permalink
Browse files

Removed rosetta and added Bing, Mapquest and Mapbox

  • Loading branch information...
1 parent 9eb4091 commit f7b0a9c590b084b9ef18cbe731316ebdc462257a @ingenieroariel ingenieroariel committed Sep 26, 2011
Showing with 25 additions and 10 deletions.
  1. +12 −2 calculator/app/static/script/app/Risiko.js
  2. +3 −0 calculator/buildjs.cfg
  3. +1 −2 debian/postinst
  4. +0 −1 debian/rules
  5. +3 −2 risiko/settings.py
  6. +6 −3 risiko/urls.py
@@ -143,7 +143,17 @@ var Risiko = Ext.extend(gxp.Viewer, {
vertical: true,
height: 100
}],
-
+
+ // layer sources
+ sources: {
+ mapbox: {
+ ptype: "gxp_mapboxsource"
+ },
+ mapquest: {
+ ptype: "gxp_mapquestsource"
+ }
+ },
+
map: {
id: "map"
}
@@ -196,4 +206,4 @@ var Risiko = Ext.extend(gxp.Viewer, {
for (var s in symbol) {
symbol[s.toUpperCase()] = symbol[s];
}
-})();
+})();
View
@@ -88,6 +88,9 @@ include =
plugins/GoogleSource.js
plugins/OLSource.js
plugins/OSMSource.js
+ plugins/BingSource.js
+ plugins/MapBoxSource.js
+ plugins/MapQuestSource.js
plugins/WMSCSource.js
plugins/ZoomToExtent.js
plugins/ZoomToLayerExtent.js
View
@@ -26,11 +26,10 @@ case "$1" in
# Activate virtual environment to install risiko
source /var/lib/geonode/bin/activate
- pip install /usr/share/risiko/django-rosetta*.tar.gz
pip install /usr/share/risiko/risiko*.tar.gz
sitedir=`/var/lib/geonode/bin/python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()"`
- ln -s /etc/default/geonode $sitedir/risiko/local_settings.py
+ ln -s /etc/geonode/local_settings.py $sitedir/risiko/local_settings.py
cd $sitedir/risiko
python manage.py syncdb --noinput
python manage.py collectstatic -v0 --noinput
View
@@ -20,7 +20,6 @@ install:
python setup.py sdist
mkdir -p $(CURDIR)/debian/risiko/usr/share/risiko
cp -rp $(CURDIR)/dist/risiko-*.tar.gz $(CURDIR)/debian/risiko/usr/share/risiko/.
- cp -rp $(CURDIR)/../temp/django-rosetta-0.6.2.tar.gz $(CURDIR)/debian/risiko/usr/share/risiko/.
cp -rp $(CURDIR)/debian/patches/* $(CURDIR)/debian/risiko/usr/share/risiko/.
binary-indep: build install
View
@@ -239,7 +239,7 @@
'django.contrib.sessions',
'django.contrib.sites',
'django.contrib.admin',
- 'django.contrib.staticfiles',
+ 'staticfiles',
'django_extensions',
'registration',
'profiles',
@@ -249,7 +249,8 @@
'geonode.proxy',
'impact',
'django_nose',
- 'rosetta')
+# 'rosetta',
+)
LOGGING = {
'version': 1,
View
@@ -1,7 +1,8 @@
from django.conf.urls.defaults import *
from django.conf import settings
-from django.contrib.staticfiles.urls import staticfiles_urlpatterns
+from staticfiles.urls import staticfiles_urlpatterns
from django.contrib import admin
+from geonode.proxy.urls import urlpatterns as proxy_urlpatterns
admin.autodiscover()
@@ -17,7 +18,7 @@
{'template': 'lang_risiko.js', 'mimetype': 'text/javascript'}, 'lang'),
(r'^maps/', include('geonode.maps.urls')),
(r'^proxy/', 'geonode.proxy.views.proxy'),
- (r'^geoserver/', 'geonode.proxy.views.geoserver'),
+ (r'^gs/', 'geonode.proxy.views.geoserver'),
url(r'^data/$', 'geonode.maps.views.browse_data', name='data'),
url(r'^data/acls/?$', 'geonode.maps.views.layer_acls', name='layer_acls'),
url(r'^data/api/batch_permissions/?$',
@@ -39,6 +40,8 @@
(r'^avatar/', include('avatar.urls')),
(r'^accounts/', include('registration.urls')),
(r'^profiles/', include('profiles.urls')),
- (r'^rosetta/', include('rosetta.urls')),
+# (r'^rosetta/', include('rosetta.urls')),
(r'^impact/', include('impact.urls')),
) + staticfiles_urlpatterns()
+
+urlpatterns += proxy_urlpatterns

0 comments on commit f7b0a9c

Please sign in to comment.