# \[Branch ~dhis2-devs-core/dhis2/trunk\] Rev 16140: GIS api logic bug fixed, json/jsonp separated, event popup bug fixed.

**URL:** <https://community.dhis2.org/t/branch-dhis2-devs-core-dhis2-trunk-rev-16140-gis-api-logic-bug-fixed-json-jsonp-separated-event-popup-bug-fixed/25551>\
**Category:** Support - Assistance technique\
**Created:** [15 July 2014 19:30 UTC](https://community.dhis2.org/t/branch-dhis2-devs-core-dhis2-trunk-rev-16140-gis-api-logic-bug-fixed-json-jsonp-separated-event-popup-bug-fixed/25551 "2014-07-15T19:30:37Z")\
**Posts on this page:** 1\
**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:** [15 July 2014 19:30 UTC](https://community.dhis2.org/t/branch-dhis2-devs-core-dhis2-trunk-rev-16140-gis-api-logic-bug-fixed-json-jsonp-separated-event-popup-bug-fixed/25551/1 "2014-07-15T19:30:37Z")

</div>

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

[revision-diff.txt](https://dhis2.b-cdn.net/uploads/default/original/3X/1/f/1f2b48d5ed1f97e29967d6df9a6032ee21c3a166.txt) (8.88 KB)

> **···**
>
> ------------------------------------------------------------  
> revno: 16140 [merge]  
> committer: Jan Henrik Overland \<janhenrik.overland@gmail.com\>  
> branch nick: dhis2  
> timestamp: Tue 2014-07-15 21:29:24 +0200  
> message:  
> &nbsp;&nbsp;GIS api logic bug fixed, json/jsonp separated, event popup bug fixed.  
> modified:  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js  
> &nbsp;&nbsp;dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/core.js
> 
> --  
> 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)