# \[Branch ~dhis2-devs-core/dhis2/trunk\] Rev 2189: (GIS)	Map source	types 'geojson' and 'shapefile' removed. Maps are	specified by	parent orgunit (b...

**URL:** <https://community.dhis2.org/t/branch-dhis2-devs-core-dhis2-trunk-rev-2189-gis-map-source-types-geojson-and-shapefile-removed-maps-are-specified-by-parent-orgunit-b/9605>\
**Category:** Support - Assistance technique\
**Created:** [26 November 2010 18:13 UTC](https://community.dhis2.org/t/branch-dhis2-devs-core-dhis2-trunk-rev-2189-gis-map-source-types-geojson-and-shapefile-removed-maps-are-specified-by-parent-orgunit-b/9605 "2010-11-26T18:13:49Z")\
**Posts on this page:** 3\
**Page:** 1

<div class="post-metadata">

**Author:** ![DHIS\_2\_Users](https://dhis2.b-cdn.net/letter_avatar_proxy/v4/letter/d/9fc29f/32.png) [@DHIS\_2\_Users](https://community.dhis2.org/u/DHIS_2_Users)\
**Post date:** [26 November 2010 18:13 UTC](https://community.dhis2.org/t/branch-dhis2-devs-core-dhis2-trunk-rev-2189-gis-map-source-types-geojson-and-shapefile-removed-maps-are-specified-by-parent-orgunit-b/9605/1 "2010-11-26T18:13:49Z")

</div>

Merge authors:  
&nbsp;&nbsp;Jan Henrik Øverland (janhenrik-overland)

> **···**
>
> ------------------------------------------------------------  
> revno: 2189 [merge]  
> committer: Jan Henrik Overland \<janhenrik.overland@gmail.com\>  
> branch nick: trunk  
> timestamp: Fri 2010-11-26 19:11:03 +0100  
> message:  
> &nbsp;&nbsp;(GIS) Map source types 'geojson' and 'shapefile' removed. Maps are specified by parent orgunit (boundary) and orgunitlevel (level). Facility coordinates now stored correctly after import. General code streamlining. Number of ajax requests on page load reduced.  
> removed:  
> &nbsp;&nbsp;dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/Map.java  
> &nbsp;&nbsp;dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MapOrganisationUnitRelation.java  
> &nbsp;&nbsp;dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/comparator/MapNameComparator.java  
> &nbsp;&nbsp;dhis-2/dhis-services/dhis-service-mapping/src/main/java/org/hisp/dhis/mapping/MapDeletionHandler.java  
> &nbsp;&nbsp;dhis-2/dhis-services/dhis-service-mapping/src/main/java/org/hisp/dhis/mapping/MapOrganisationUnitRelationDeletionHandler.java  
> &nbsp;&nbsp;dhis-2/dhis-services/dhis-service-mapping/src/main/resources/org/hisp/dhis/mapping/hibernate/Map.hbm.xml  
> &nbsp;&nbsp;dhis-2/dhis-services/dhis-service-mapping/src/main/resources/org/hisp/dhis/mapping/hibernate/MapOrganisationUnitRelation.hbm.xml  
> &nbsp;&nbsp;dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/deletion/DeletionManagerTest.java  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/AddMapOrganisationUnitRelationAction.java  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/AddOrUpdateMapAction.java  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/AddOrUpdateMapOrganisationUnitRelationAction.java  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/AddOrUpdateMapOrganisationUnitRelationsAction.java  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/DeleteMapAction.java  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/DeleteMapOrganisationUnitRelationsAction.java  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/DeleteMapOrganisationUnitRelationsByMapAction.java  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetAllMapsAction.java  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetAvailableMapOrganisationUnitRelationsAction.java  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetBaseCoordinateAction.java  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetDataMapValuesByMapAction.java  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetIndicatorMapValuesByMapAction.java  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetIndicatorMapValuesByMapAndFeatureIdAction.java  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetMapByMapLayerPathAction.java  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetMapOrganisationUnitRelationByFeatureIdAction.java  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetMapsByTypeAction.java  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/SetBaseCoordinateAction.java  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/init  
> added:  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetDataElementMapValuesAction.java  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetGeoJsonAction.java  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetIndicatorMapValuesAction.java  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/InitializeAction.java  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonInitialize.vm  
> renamed:  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetDataMapValuesByLevelAction.java =\> dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetDataElementMapValuesByLevelAction.java  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetDataMapValuesByParentAction.java =\> dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetDataElementMapValuesByParentAction.java  
> modified:  
> &nbsp;&nbsp;dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedMapValue.java  
> &nbsp;&nbsp;dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MapLayer.java  
> &nbsp;&nbsp;dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MapView.java  
> &nbsp;&nbsp;dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MappingService.java  
> &nbsp;&nbsp;dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MappingStore.java  
> &nbsp;&nbsp;dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnit.java  
> &nbsp;&nbsp;dhis-2/dhis-api/src/test/java/org/hisp/dhis/organisationunit/OrganisationUnitTest.java  
> &nbsp;&nbsp;dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java  
> &nbsp;&nbsp;dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/OrganisationUnitConverter.java  
> &nbsp;&nbsp;dhis-2/dhis-services/dhis-service-mapping/src/main/java/org/hisp/dhis/mapping/DefaultMappingService.java  
> &nbsp;&nbsp;dhis-2/dhis-services/dhis-service-mapping/src/main/java/org/hisp/dhis/mapping/MapViewDeletionHandler.java  
> &nbsp;&nbsp;dhis-2/dhis-services/dhis-service-mapping/src/main/java/org/hisp/dhis/mapping/hibernate/HibernateMappingStore.java  
> &nbsp;&nbsp;dhis-2/dhis-services/dhis-service-mapping/src/main/resources/META-INF/dhis/beans.xml  
> &nbsp;&nbsp;dhis-2/dhis-services/dhis-service-mapping/src/main/resources/org/hisp/dhis/mapping/hibernate/MapLayer.hbm.xml  
> &nbsp;&nbsp;dhis-2/dhis-services/dhis-service-mapping/src/main/resources/org/hisp/dhis/mapping/hibernate/MapView.hbm.xml  
> &nbsp;&nbsp;dhis-2/dhis-services/dhis-service-mapping/src/test/java/org/hisp/dhis/mapping/MappingServiceTest.java  
> &nbsp;&nbsp;dhis-2/dhis-services/dhis-service-mapping/src/test/java/org/hisp/dhis/mapping/MappingStoreTest.java  
> &nbsp;&nbsp;dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DeletionHandler.java  
> &nbsp;&nbsp;dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/encoding/velocity/EncoderVelocityContext.java  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/AddOrUpdateMapViewAction.java  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetAllMapLayersAction.java  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetAllMapViewsAction.java  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetIndicatorsByIndicatorGroupAction.java  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetMapUserSettingsAction.java  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetMapViewAction.java  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetOrganisationUnitChildrenAction.java  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/SetMapUserSettingsAction.java  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/resources/META-INF/dhis/beans.xml  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n\_module.properties  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/resources/struts.xml  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/geojsonPoint.vm  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/geojsonPolygon.vm  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/i18n.vm  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonBaseCoordinate.vm  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonDataElementGroups.vm  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonIndicatorGroups.vm  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonMap.vm  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonMapLayers.vm  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonMapLegendSet.vm  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonMapLegendSets.vm  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonMapLegends.vm  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonMapOrganisationUnitRelation.vm  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonMapOrganisationUnitRelations.vm  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonMapView.vm  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonMapViews.vm  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonOrganisationUnitChildren.vm  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonOrganisationUnitLevels.vm  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonOrganisationUnits.vm  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonOutputFile.vm  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonPeriodTypes.vm  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonPeriods.vm  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonUserSettings.vm  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonminDataElements.vm  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonminIndicators.vm  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonminMapLegendSets.vm  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonminMapOrganisationUnitRelations.vm  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonminMapViews.vm  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonminMaps.vm  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonminOrganisationUnits.vm  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/globals.js  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/msg/msg.css  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/core/GeoStat.js  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/core/GeoStat/Choropleth.js  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/core/GeoStat/Symbol.js  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Mapping.js  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.js  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetDataElementMapValuesByLevelAction.java  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetDataElementMapValuesByParentAction.java  
> The size of the diff (14446 lines) is larger than your specified limit of 5000 lines
> 
> --  
> lp:dhis2
> 
> > **[trunk : Code : DHIS](https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk)**
> >
> > The trunk is where the mainline development takes place.
> 
> Your team DHIS 2 developers is subscribed to branch lp:dhis2.  
> To unsubscribe from this branch go to [OpenID transaction in progress](https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription)

---

<div class="post-metadata">

**Author:** ![Knut\_Staring](https://dhis2.b-cdn.net/user_avatar/community.dhis2.org/knut_staring/32/32549_2.png) [@Knut\_Staring](https://community.dhis2.org/u/Knut_Staring)\
**Post date:** [26 November 2010 19:10 UTC](https://community.dhis2.org/t/branch-dhis2-devs-core-dhis2-trunk-rev-2189-gis-map-source-types-geojson-and-shapefile-removed-maps-are-specified-by-parent-orgunit-b/9605/2 "2010-11-26T19:10:47Z")

</div>

Happy to see this. Be aware that you if you want to test this, you  
cannot use your old map views (e.g. via Dashboard). So select GIS in  
the menu instead, delete your old map views and create new ones.

Knut

> **···**
>
> On Fri, Nov 26, 2010 at 7:13 PM, \<noreply@launchpad.net\> wrote:
> 
> > Merge authors:  
> > Jan Henrik Øverland (janhenrik-overland)  
> > ------------------------------------------------------------  
> > revno: 2189 [merge]  
> > committer: Jan Henrik Overland \<janhenrik.overland@gmail.com\>  
> > branch nick: trunk  
> > timestamp: Fri 2010-11-26 19:11:03 +0100  
> > message:  
> > (GIS) Map source types 'geojson' and 'shapefile' removed. Maps are specified by parent orgunit (boundary) and orgunitlevel (level). \>Facility coordinates now stored correctly after import. General code streamlining. Number of ajax requests on page load reduced.

---

<div class="post-metadata">

**Author:** ![Knut\_Staring](https://dhis2.b-cdn.net/user_avatar/community.dhis2.org/knut_staring/32/32549_2.png) [@Knut\_Staring](https://community.dhis2.org/u/Knut_Staring)\
**Post date:** [27 November 2010 00:43 UTC](https://community.dhis2.org/t/branch-dhis2-devs-core-dhis2-trunk-rev-2189-gis-map-source-types-geojson-and-shapefile-removed-maps-are-specified-by-parent-orgunit-b/9605/3 "2010-11-27T00:43:08Z")

</div>

Attached is an example of the kinds of maps that are now possible.

Knut

![image](https://dhis2.b-cdn.net/images/transparent.png)

> **···**
>
> On Fri, Nov 26, 2010 at 8:10 PM, Knut Staring \<knutst@gmail.com\> wrote:
> 
> > On Fri, Nov 26, 2010 at 7:13 PM, \<noreply@launchpad.net\> wrote:
> > 
> > > Merge authors:  
> > > Jan Henrik Øverland (janhenrik-overland)  
> > > ------------------------------------------------------------  
> > > revno: 2189 [merge]  
> > > committer: Jan Henrik Overland \<janhenrik.overland@gmail.com\>  
> > > branch nick: trunk  
> > > timestamp: Fri 2010-11-26 19:11:03 +0100  
> > > message:  
> > > (GIS) Map source types 'geojson' and 'shapefile' removed. Maps are specified by parent orgunit (boundary) and orgunitlevel (level). \>Facility coordinates now stored correctly after import. General code streamlining. Number of ajax requests on page load reduced.
> > 
> > Happy to see this. Be aware that you if you want to test this, you  
> > cannot use your old map views (e.g. via Dashboard). So select GIS in  
> > the menu instead, delete your old map views and create new ones.
> > 
> > Knut
> 
> --  
> Cheers,  
> Knut Staring
