← Back to branch summary

~uwthw/sahana-eden/rms

~uwthw/sahana-eden/rms

« back to all changes in this revision

Viewing changes to views/gis/ol_layers_all.js

Committer: Nicholas Preston
Date: 2010-01-29 07:40:49 UTC
mfrom: (434.1.181 haiti)
Revision ID: nicopresto@nicopresto-desktop-20100129074049-qz4jwrmhdrjhguiq

Merge with haiti-quake-2010

files added:
controllers/bulk_gis.py

cron/import_job_do_import.py

cron/import_job_do_processing.py

modules/s3gis.py

static/styles/admin

static/styles/admin/import_job.css

views/admin/_import_job_reload_status.html

views/admin/_import_job_status_failed.html

views/admin/_import_job_status_import.html

views/admin/_import_job_status_imported.html

views/admin/_import_job_status_new.html

views/admin/_import_job_status_processed.html

views/admin/_import_job_status_processing.html

views/admin/import_job_list.html

views/admin/import_job_update.html

views/or/offices_by_org.js

views/pr/report.html

files removed:
models/05_or.py.bak

views/or/activity_popup.html

views/rms/sms_request_display.html

views/rms/tweet_request_display.html

files modified:
.bzrignore

VERSION

controllers/admin.py

controllers/gis.py

controllers/hms.py

controllers/or.py

controllers/pr.py

cron/crontab

models/00_db.py

models/00_settings.py

models/00_tables.py

models/01_RESTlike_controller.py

models/01_menu.py

models/01_modules.py

models/02_pr.py

models/03_gis.py

models/04_pr.py

models/05_or.py

models/06_lms.py

models/admin.py

models/budget.py

models/dvi.py

models/hms.py

models/msg.py

models/nim.py

models/sync.py

models/vol.py

models/zzz_1st_run.py

modules/s3xrc.py

modules/sahana.py

modules/validators.py

static/scripts/S3/S3.min.js

static/scripts/S3/jquery.autocomplete.js

static/scripts/S3/jquery.cluetip.js

static/scripts/S3/thickbox.js

static/styles/S3/sahana.css

static/styles/S3/sahana.min.css

static/styles/S3/template.css

static/xslt/export/kml.xsl

views/admin/import_data.html

views/default/index.html

views/footer.html

views/gis/index.html

views/gis/ol_controls.js

views/gis/ol_features_popup.html

views/gis/ol_layers_all.js

views/gis/ol_layers_features.js

views/gis/ol_layers_georss.js

views/gis/ol_layers_kml.js

views/gis/toolbar.js

views/hms/index.html

views/layout.html

views/or/contact_create.html

views/or/dashboard.html

views/or/index.html

views/pr/index.html

views/pr/person_create.html

views/pr/person_list_create.html

views/pr/person_popup.html

Show diffs side-by-side

added added

removed removed

views/gis/ol_layers_all.js

15

15

{{else:}}

16

16

// Disable other base layers since using a non-sphericalMercator WMS projection

17

17

{{pass}}

18

{{include 'gis/ol_layers_tms.js'}}

18

19

{{include 'gis/ol_layers_wms.js'}}

19

20

{{include 'gis/ol_layers_xyz.js'}}

20

21

var style_marker = OpenLayers.Util.extend({}, OpenLayers.Feature.Vector.style['default']);

24

25

var max_h = 35;

25

26

var width, height;

26

27

var iconURL;

27

28

var strategy = new OpenLayers.Strategy.Cluster({distance: {{=cluster_distance}}, threshold: {{=cluster_threshold}}});

28

29

{{include 'gis/ol_layers_georss.js'}}

29

30

{{include 'gis/ol_layers_gpx.js'}}

30

31

{{include 'gis/ol_layers_kml.js'}}

Older »