[Branch ~dhis2-devs-core/dhis2/trunk] Rev 21957: New Leaflet-based GIS module

Bjorn,

Will this be back-ported to 2.22 or earlier versions?

Regards

Calle

···

On 12 February 2016 at 14:07, noreply@launchpad.net wrote:


revno: 21957

committer: Bjorn Sandvik bjorn@mastermaps.com

branch nick: dhis2

timestamp: Fri 2016-02-12 13:06:10 +0100

message:

New Leaflet-based GIS module

removed:

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app.properties

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_ar.properties

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_es.properties

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_fr.properties

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_in_ID.properties

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_lo.properties

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_my.properties

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_pt.properties

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_pt_BR.properties

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_ru.properties

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_tg.properties

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_vi.properties

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_zh.properties

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/arrow.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/arrowdown.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/arrowdowndouble.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/arrowupdouble.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/boundary_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/boundary_20.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/chart_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/check-un.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/check.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/checkbox.gif

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/clear_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/data.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/dl_datasource.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/dl_tablelayout.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/download_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/drill_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/edit_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/error_m.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/event_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/event_20.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/facility_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/facility_20.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/favorite_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/favorite_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/filter_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/filter_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/float_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/gear_18.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/google-logo.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/googleHybrid_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/googleStreets_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/grid-dashboard_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/grid-delete_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/grid-edit_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/grid-save_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/grid-sharing_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/history_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/information_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/information_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/interpretation_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/labels_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/labels_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/layers_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/layers_24.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/leaf.gif

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/left-btn.gif

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/legendset_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/loading.gif

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/map_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/measure_24.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/menu-item-active-bg.gif

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/node-select-child.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/openStreetMap_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/organisationunit.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/period.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/refresh_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/relocate_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/relocate_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/right-btn.gif

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/search_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/search_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/spinner_24.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/symbol_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/symbol_20.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/table_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/text_bold.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/text_italic.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/thematic1_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/thematic1_20.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/thematic2_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/thematic2_20.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/thematic3_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/thematic3_20.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/thematic4_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/thematic4_20.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/tool-sprites.gif

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/trigger.gif

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/warning.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/zoomin_24.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/zoomout_24.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/zoomvisible_24.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/index.html

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/manifest.webapp

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/plugin.html

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/core.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/custom.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/ext-ux/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/ext-ux/ext-ux-custom.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/geoext/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/geoext/script/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/geoext/script/custom.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/map.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/MapFish.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/core/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/core/Color.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/core/GeoStat/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/core/GeoStat.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/core/GeoStat/Boundary.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/core/GeoStat/Facility.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/core/GeoStat/Symbol.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/core/GeoStat/Thematic1.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/core/GeoStat/Thematic2.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/core/GeoStat/Thematic3.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/core/GeoStat/Thematic4.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/core/GeoStat/all.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/core/Util.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/widgets/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/widgets/geostat/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/widgets/geostat/Boundary.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/widgets/geostat/Facility.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/widgets/geostat/Symbol.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/widgets/geostat/Thematic1.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/widgets/geostat/Thematic2.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers-ux/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers-ux/Circle.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers-ux/newSelectFeature.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/OpenLayers.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/blank.gif

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/cloud-popup-relative.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/drag-rectangle-off.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/drag-rectangle-on.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/east-mini.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/layer-switcher-maximize.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/layer-switcher-minimize.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/marker-blue.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/marker-gold.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/marker-green.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/marker.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/measuring-stick-off.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/measuring-stick-on.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/north-mini.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/panning-hand-off.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/panning-hand-on.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/slider.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/south-mini.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/west-mini.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/zoom-minus-mini.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/zoom-plus-mini.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/zoom-world-mini.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/zoombar.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/script/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/script/OpenStreetMap.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/google.css

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/google.tidy.css

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/ie6-style.css

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/ie6-style.tidy.css

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/add_point_off.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/add_point_on.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/blank.gif

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/close.gif

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/drag-rectangle-off.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/drag-rectangle-on.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/draw_line_off.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/draw_line_on.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/draw_point_off.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/draw_point_on.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/draw_polygon_off.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/draw_polygon_on.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/editing_tool_bar.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/move_feature_off.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/move_feature_on.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/navigation_history.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/overview_replacement.gif

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/pan-panel-NOALPHA.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/pan-panel.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/pan_off.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/pan_on.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/panning-hand-off.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/panning-hand-on.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/remove_point_off.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/remove_point_on.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/ruler.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/save_features_off.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/save_features_on.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/view_next_off.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/view_next_on.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/view_previous_off.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/view_previous_on.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/zoom-panel-NOALPHA.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/zoom-panel.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/style.css

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/style.mobile.css

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/style.mobile.tidy.css

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/style.tidy.css

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/styles/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/styles/style.css

modified:

dhis-2/dhis-web/dhis-web-apps/pom.xml

dhis-2/dhis-web/dhis-web-apps/src/main/resources/struts.xml

The size of the diff (42368 lines) is larger than your specified limit of 5000 lines

lp:dhis2

https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.

To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription


Mailing list: https://launchpad.net/~dhis2-devs

Post to : dhis2-devs@lists.launchpad.net

Unsubscribe : https://launchpad.net/~dhis2-devs

More help : https://help.launchpad.net/ListHelp


Calle Hedberg

46D Alma Road, 7700 Rosebank, SOUTH AFRICA

Tel/fax (home): +27-21-685-6472

Cell: +27-82-853-5352

Iridium SatPhone: +8816-315-19119

Email: calle.hedberg@gmail.com

Skype: calle_hedberg


Hi Calle,

will not back-port this. We usually back-port bugfixes or very minor features - this is a major refactor of the GIS module, replacing the openlayers framework with leaflet.

regards,

Lars

···

On Sat, Feb 13, 2016 at 10:36 PM, Calle Hedberg calle.hedberg@gmail.com wrote:

Bjorn,

Will this be back-ported to 2.22 or earlier versions?

Regards

Calle


Mailing list: https://launchpad.net/~dhis2-devs

Post to : dhis2-devs@lists.launchpad.net

Unsubscribe : https://launchpad.net/~dhis2-devs

More help : https://help.launchpad.net/ListHelp

On 12 February 2016 at 14:07, noreply@launchpad.net wrote:


revno: 21957

committer: Bjorn Sandvik bjorn@mastermaps.com

branch nick: dhis2

timestamp: Fri 2016-02-12 13:06:10 +0100

message:

New Leaflet-based GIS module

removed:

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app.properties

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_ar.properties

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_es.properties

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_fr.properties

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_in_ID.properties

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_lo.properties

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_my.properties

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_pt.properties

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_pt_BR.properties

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_ru.properties

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_tg.properties

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_vi.properties

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_zh.properties

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/arrow.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/arrowdown.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/arrowdowndouble.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/arrowupdouble.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/boundary_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/boundary_20.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/chart_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/check-un.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/check.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/checkbox.gif

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/clear_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/data.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/dl_datasource.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/dl_tablelayout.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/download_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/drill_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/edit_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/error_m.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/event_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/event_20.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/facility_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/facility_20.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/favorite_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/favorite_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/filter_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/filter_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/float_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/gear_18.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/google-logo.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/googleHybrid_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/googleStreets_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/grid-dashboard_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/grid-delete_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/grid-edit_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/grid-save_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/grid-sharing_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/history_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/information_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/information_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/interpretation_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/labels_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/labels_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/layers_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/layers_24.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/leaf.gif

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/left-btn.gif

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/legendset_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/loading.gif

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/map_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/measure_24.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/menu-item-active-bg.gif

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/node-select-child.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/openStreetMap_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/organisationunit.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/period.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/refresh_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/relocate_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/relocate_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/right-btn.gif

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/search_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/search_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/spinner_24.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/symbol_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/symbol_20.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/table_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/text_bold.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/text_italic.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/thematic1_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/thematic1_20.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/thematic2_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/thematic2_20.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/thematic3_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/thematic3_20.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/thematic4_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/thematic4_20.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/tool-sprites.gif

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/trigger.gif

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/warning.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/zoomin_24.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/zoomout_24.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/zoomvisible_24.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/index.html

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/manifest.webapp

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/plugin.html

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/core.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/custom.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/ext-ux/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/ext-ux/ext-ux-custom.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/geoext/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/geoext/script/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/geoext/script/custom.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/map.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/MapFish.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/core/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/core/Color.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/core/GeoStat/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/core/GeoStat.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/core/GeoStat/Boundary.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/core/GeoStat/Facility.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/core/GeoStat/Symbol.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/core/GeoStat/Thematic1.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/core/GeoStat/Thematic2.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/core/GeoStat/Thematic3.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/core/GeoStat/Thematic4.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/core/GeoStat/all.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/core/Util.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/widgets/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/widgets/geostat/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/widgets/geostat/Boundary.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/widgets/geostat/Facility.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/widgets/geostat/Symbol.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/widgets/geostat/Thematic1.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/widgets/geostat/Thematic2.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers-ux/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers-ux/Circle.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers-ux/newSelectFeature.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/OpenLayers.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/blank.gif

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/cloud-popup-relative.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/drag-rectangle-off.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/drag-rectangle-on.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/east-mini.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/layer-switcher-maximize.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/layer-switcher-minimize.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/marker-blue.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/marker-gold.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/marker-green.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/marker.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/measuring-stick-off.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/measuring-stick-on.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/north-mini.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/panning-hand-off.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/panning-hand-on.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/slider.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/south-mini.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/west-mini.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/zoom-minus-mini.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/zoom-plus-mini.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/zoom-world-mini.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/zoombar.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/script/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/script/OpenStreetMap.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/google.css

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/google.tidy.css

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/ie6-style.css

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/ie6-style.tidy.css

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/add_point_off.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/add_point_on.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/blank.gif

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/close.gif

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/drag-rectangle-off.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/drag-rectangle-on.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/draw_line_off.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/draw_line_on.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/draw_point_off.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/draw_point_on.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/draw_polygon_off.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/draw_polygon_on.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/editing_tool_bar.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/move_feature_off.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/move_feature_on.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/navigation_history.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/overview_replacement.gif

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/pan-panel-NOALPHA.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/pan-panel.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/pan_off.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/pan_on.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/panning-hand-off.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/panning-hand-on.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/remove_point_off.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/remove_point_on.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/ruler.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/save_features_off.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/save_features_on.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/view_next_off.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/view_next_on.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/view_previous_off.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/view_previous_on.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/zoom-panel-NOALPHA.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/zoom-panel.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/style.css

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/style.mobile.css

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/style.mobile.tidy.css

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/style.tidy.css

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/styles/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/styles/style.css

modified:

dhis-2/dhis-web/dhis-web-apps/pom.xml

dhis-2/dhis-web/dhis-web-apps/src/main/resources/struts.xml

The size of the diff (42368 lines) is larger than your specified limit of 5000 lines

lp:dhis2

https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.

To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription


Mailing list: https://launchpad.net/~dhis2-devs

Post to : dhis2-devs@lists.launchpad.net

Unsubscribe : https://launchpad.net/~dhis2-devs

More help : https://help.launchpad.net/ListHelp


Calle Hedberg

46D Alma Road, 7700 Rosebank, SOUTH AFRICA

Tel/fax (home): +27-21-685-6472

Cell: +27-82-853-5352

Iridium SatPhone: +8816-315-19119

Email: calle.hedberg@gmail.com

Skype: calle_hedberg


Lars Helge Øverland

Lead developer, DHIS 2

University of Oslo

Skype: larshelgeoverland

http://www.dhis2.org

Lars,

Thanks - no problem, as expected, just wanted confirmation.

Regards

Calle

···

On 14 February 2016 at 23:20, Lars Helge Øverland lars@dhis2.org wrote:

Hi Calle,

will not back-port this. We usually back-port bugfixes or very minor features - this is a major refactor of the GIS module, replacing the openlayers framework with leaflet.

regards,

Lars

On Sat, Feb 13, 2016 at 10:36 PM, Calle Hedberg calle.hedberg@gmail.com wrote:

Bjorn,

Will this be back-ported to 2.22 or earlier versions?

Regards

Calle


Mailing list: https://launchpad.net/~dhis2-devs

Post to : dhis2-devs@lists.launchpad.net

Unsubscribe : https://launchpad.net/~dhis2-devs

More help : https://help.launchpad.net/ListHelp

Lars Helge Øverland

Lead developer, DHIS 2

University of Oslo

Skype: larshelgeoverland

http://www.dhis2.org

On 12 February 2016 at 14:07, noreply@launchpad.net wrote:


revno: 21957

committer: Bjorn Sandvik bjorn@mastermaps.com

branch nick: dhis2

timestamp: Fri 2016-02-12 13:06:10 +0100

message:

New Leaflet-based GIS module

removed:

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app.properties

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_ar.properties

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_es.properties

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_fr.properties

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_in_ID.properties

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_lo.properties

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_my.properties

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_pt.properties

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_pt_BR.properties

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_ru.properties

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_tg.properties

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_vi.properties

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_zh.properties

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/arrow.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/arrowdown.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/arrowdowndouble.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/arrowupdouble.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/boundary_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/boundary_20.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/chart_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/check-un.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/check.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/checkbox.gif

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/clear_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/data.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/dl_datasource.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/dl_tablelayout.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/download_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/drill_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/edit_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/error_m.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/event_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/event_20.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/facility_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/facility_20.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/favorite_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/favorite_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/filter_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/filter_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/float_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/gear_18.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/google-logo.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/googleHybrid_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/googleStreets_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/grid-dashboard_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/grid-delete_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/grid-edit_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/grid-save_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/grid-sharing_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/history_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/information_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/information_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/interpretation_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/labels_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/labels_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/layers_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/layers_24.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/leaf.gif

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/left-btn.gif

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/legendset_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/loading.gif

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/map_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/measure_24.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/menu-item-active-bg.gif

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/node-select-child.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/openStreetMap_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/organisationunit.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/period.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/refresh_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/relocate_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/relocate_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/right-btn.gif

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/search_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/search_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/spinner_24.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/symbol_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/symbol_20.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/table_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/text_bold.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/text_italic.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/thematic1_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/thematic1_20.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/thematic2_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/thematic2_20.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/thematic3_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/thematic3_20.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/thematic4_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/thematic4_20.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/tool-sprites.gif

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/trigger.gif

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/warning.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/zoomin_24.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/zoomout_24.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/zoomvisible_24.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/index.html

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/manifest.webapp

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/plugin.html

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/core.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/custom.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/ext-ux/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/ext-ux/ext-ux-custom.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/geoext/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/geoext/script/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/geoext/script/custom.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/map.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/MapFish.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/core/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/core/Color.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/core/GeoStat/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/core/GeoStat.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/core/GeoStat/Boundary.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/core/GeoStat/Facility.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/core/GeoStat/Symbol.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/core/GeoStat/Thematic1.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/core/GeoStat/Thematic2.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/core/GeoStat/Thematic3.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/core/GeoStat/Thematic4.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/core/GeoStat/all.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/core/Util.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/widgets/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/widgets/geostat/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/widgets/geostat/Boundary.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/widgets/geostat/Facility.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/widgets/geostat/Symbol.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/widgets/geostat/Thematic1.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/widgets/geostat/Thematic2.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers-ux/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers-ux/Circle.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers-ux/newSelectFeature.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/OpenLayers.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/blank.gif

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/cloud-popup-relative.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/drag-rectangle-off.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/drag-rectangle-on.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/east-mini.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/layer-switcher-maximize.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/layer-switcher-minimize.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/marker-blue.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/marker-gold.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/marker-green.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/marker.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/measuring-stick-off.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/measuring-stick-on.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/north-mini.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/panning-hand-off.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/panning-hand-on.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/slider.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/south-mini.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/west-mini.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/zoom-minus-mini.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/zoom-plus-mini.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/zoom-world-mini.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/zoombar.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/script/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/script/OpenStreetMap.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/google.css

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/google.tidy.css

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/ie6-style.css

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/ie6-style.tidy.css

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/add_point_off.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/add_point_on.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/blank.gif

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/close.gif

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/drag-rectangle-off.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/drag-rectangle-on.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/draw_line_off.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/draw_line_on.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/draw_point_off.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/draw_point_on.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/draw_polygon_off.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/draw_polygon_on.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/editing_tool_bar.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/move_feature_off.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/move_feature_on.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/navigation_history.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/overview_replacement.gif

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/pan-panel-NOALPHA.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/pan-panel.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/pan_off.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/pan_on.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/panning-hand-off.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/panning-hand-on.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/remove_point_off.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/remove_point_on.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/ruler.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/save_features_off.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/save_features_on.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/view_next_off.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/view_next_on.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/view_previous_off.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/view_previous_on.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/zoom-panel-NOALPHA.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/zoom-panel.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/style.css

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/style.mobile.css

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/style.mobile.tidy.css

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/style.tidy.css

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/styles/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/styles/style.css

modified:

dhis-2/dhis-web/dhis-web-apps/pom.xml

dhis-2/dhis-web/dhis-web-apps/src/main/resources/struts.xml

The size of the diff (42368 lines) is larger than your specified limit of 5000 lines

lp:dhis2

https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.

To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription


Mailing list: https://launchpad.net/~dhis2-devs

Post to : dhis2-devs@lists.launchpad.net

Unsubscribe : https://launchpad.net/~dhis2-devs

More help : https://help.launchpad.net/ListHelp


Calle Hedberg

46D Alma Road, 7700 Rosebank, SOUTH AFRICA

Tel/fax (home): +27-21-685-6472

Cell: +27-82-853-5352

Iridium SatPhone: +8816-315-19119

Email: calle.hedberg@gmail.com

Skype: calle_hedberg



Calle Hedberg

46D Alma Road, 7700 Rosebank, SOUTH AFRICA

Tel/fax (home): +27-21-685-6472

Cell: +27-82-853-5352

Iridium SatPhone: +8816-315-19119

Email: calle.hedberg@gmail.com

Skype: calle_hedberg


Sure, no problem.

···

On Sun, Feb 14, 2016 at 10:47 PM, Calle Hedberg calle.hedberg@gmail.com wrote:

Lars,

Thanks - no problem, as expected, just wanted confirmation.

Regards

Calle

On 14 February 2016 at 23:20, Lars Helge Øverland lars@dhis2.org wrote:

Hi Calle,

will not back-port this. We usually back-port bugfixes or very minor features - this is a major refactor of the GIS module, replacing the openlayers framework with leaflet.

regards,

Lars


Calle Hedberg

46D Alma Road, 7700 Rosebank, SOUTH AFRICA

Tel/fax (home): +27-21-685-6472

Cell: +27-82-853-5352

Iridium SatPhone: +8816-315-19119

Email: calle.hedberg@gmail.com

Skype: calle_hedberg


On Sat, Feb 13, 2016 at 10:36 PM, Calle Hedberg calle.hedberg@gmail.com wrote:

Bjorn,

Will this be back-ported to 2.22 or earlier versions?

Regards

Calle


Mailing list: https://launchpad.net/~dhis2-devs

Post to : dhis2-devs@lists.launchpad.net

Unsubscribe : https://launchpad.net/~dhis2-devs

More help : https://help.launchpad.net/ListHelp

Lars Helge Øverland

Lead developer, DHIS 2

University of Oslo

Skype: larshelgeoverland

http://www.dhis2.org

On 12 February 2016 at 14:07, noreply@launchpad.net wrote:


revno: 21957

committer: Bjorn Sandvik bjorn@mastermaps.com

branch nick: dhis2

timestamp: Fri 2016-02-12 13:06:10 +0100

message:

New Leaflet-based GIS module

removed:

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app.properties

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_ar.properties

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_es.properties

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_fr.properties

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_in_ID.properties

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_lo.properties

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_my.properties

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_pt.properties

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_pt_BR.properties

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_ru.properties

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_tg.properties

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_vi.properties

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_zh.properties

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/arrow.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/arrowdown.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/arrowdowndouble.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/arrowupdouble.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/boundary_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/boundary_20.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/chart_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/check-un.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/check.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/checkbox.gif

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/clear_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/data.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/dl_datasource.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/dl_tablelayout.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/download_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/drill_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/edit_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/error_m.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/event_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/event_20.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/facility_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/facility_20.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/favorite_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/favorite_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/filter_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/filter_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/float_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/gear_18.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/google-logo.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/googleHybrid_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/googleStreets_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/grid-dashboard_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/grid-delete_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/grid-edit_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/grid-save_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/grid-sharing_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/history_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/information_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/information_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/interpretation_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/labels_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/labels_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/layers_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/layers_24.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/leaf.gif

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/left-btn.gif

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/legendset_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/loading.gif

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/map_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/measure_24.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/menu-item-active-bg.gif

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/node-select-child.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/openStreetMap_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/organisationunit.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/period.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/refresh_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/relocate_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/relocate_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/right-btn.gif

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/search_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/search_16.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/spinner_24.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/symbol_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/symbol_20.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/table_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/text_bold.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/text_italic.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/thematic1_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/thematic1_20.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/thematic2_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/thematic2_20.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/thematic3_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/thematic3_20.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/thematic4_14.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/thematic4_20.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/tool-sprites.gif

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/trigger.gif

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/warning.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/zoomin_24.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/zoomout_24.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/zoomvisible_24.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/index.html

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/manifest.webapp

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/plugin.html

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/core.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/custom.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/ext-ux/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/ext-ux/ext-ux-custom.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/geoext/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/geoext/script/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/geoext/script/custom.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/map.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/MapFish.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/core/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/core/Color.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/core/GeoStat/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/core/GeoStat.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/core/GeoStat/Boundary.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/core/GeoStat/Facility.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/core/GeoStat/Symbol.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/core/GeoStat/Thematic1.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/core/GeoStat/Thematic2.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/core/GeoStat/Thematic3.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/core/GeoStat/Thematic4.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/core/GeoStat/all.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/core/Util.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/widgets/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/widgets/geostat/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/widgets/geostat/Boundary.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/widgets/geostat/Facility.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/widgets/geostat/Symbol.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/widgets/geostat/Thematic1.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/widgets/geostat/Thematic2.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers-ux/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers-ux/Circle.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers-ux/newSelectFeature.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/OpenLayers.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/blank.gif

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/cloud-popup-relative.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/drag-rectangle-off.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/drag-rectangle-on.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/east-mini.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/layer-switcher-maximize.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/layer-switcher-minimize.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/marker-blue.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/marker-gold.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/marker-green.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/marker.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/measuring-stick-off.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/measuring-stick-on.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/north-mini.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/panning-hand-off.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/panning-hand-on.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/slider.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/south-mini.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/west-mini.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/zoom-minus-mini.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/zoom-plus-mini.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/zoom-world-mini.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img/zoombar.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/script/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/script/OpenStreetMap.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/google.css

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/google.tidy.css

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/ie6-style.css

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/ie6-style.tidy.css

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/add_point_off.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/add_point_on.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/blank.gif

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/close.gif

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/drag-rectangle-off.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/drag-rectangle-on.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/draw_line_off.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/draw_line_on.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/draw_point_off.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/draw_point_on.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/draw_polygon_off.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/draw_polygon_on.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/editing_tool_bar.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/move_feature_off.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/move_feature_on.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/navigation_history.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/overview_replacement.gif

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/pan-panel-NOALPHA.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/pan-panel.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/pan_off.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/pan_on.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/panning-hand-off.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/panning-hand-on.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/remove_point_off.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/remove_point_on.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/ruler.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/save_features_off.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/save_features_on.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/view_next_off.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/view_next_on.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/view_previous_off.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/view_previous_on.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/zoom-panel-NOALPHA.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img/zoom-panel.png

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/style.css

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/style.mobile.css

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/style.mobile.tidy.css

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/style.tidy.css

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/styles/

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/styles/style.css

modified:

dhis-2/dhis-web/dhis-web-apps/pom.xml

dhis-2/dhis-web/dhis-web-apps/src/main/resources/struts.xml

The size of the diff (42368 lines) is larger than your specified limit of 5000 lines

lp:dhis2

https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.

To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription


Mailing list: https://launchpad.net/~dhis2-devs

Post to : dhis2-devs@lists.launchpad.net

Unsubscribe : https://launchpad.net/~dhis2-devs

More help : https://help.launchpad.net/ListHelp


Calle Hedberg

46D Alma Road, 7700 Rosebank, SOUTH AFRICA

Tel/fax (home): +27-21-685-6472

Cell: +27-82-853-5352

Iridium SatPhone: +8816-315-19119

Email: calle.hedberg@gmail.com

Skype: calle_hedberg


Lars Helge Øverland

Lead developer, DHIS 2

University of Oslo

Skype: larshelgeoverland

http://www.dhis2.org