dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 8920 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2012-11-06 22:51:07 +0300
message:
  (GIS) Filter improved.
modified:
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/mapfish/widgets/geostat/Thematic1.js
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/mapfish/widgets/geostat/Thematic2.js


--
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

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/mapfish/widgets/geostat/Thematic1.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/mapfish/widgets/geostat/Thematic1.js	2012-11-06 15:34:05 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/mapfish/widgets/geostat/Thematic1.js	2012-11-06 19:47:04 +0000
@@ -1654,8 +1654,6 @@
 					return;
 				}
 				
-				this.features = this.layer.features.slice(0);
-				
 				this.loadData(features);
 			}
 		});
@@ -1725,6 +1723,8 @@
 					this.layer.features = GIS.util.vector.getTransformedFeatureArray(this.layer.features);
 				}
 				
+				this.features = this.layer.features.slice(0);
+				
 				this.loadLegend();
 			}
 		});

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/mapfish/widgets/geostat/Thematic2.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/mapfish/widgets/geostat/Thematic2.js	2012-11-06 15:34:49 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/mapfish/widgets/geostat/Thematic2.js	2012-11-06 19:47:04 +0000
@@ -1654,8 +1654,6 @@
 					return;
 				}
 				
-				this.features = this.layer.features.slice(0);
-				
 				this.loadData(features);
 			}
 		});
@@ -1725,6 +1723,8 @@
 					this.layer.features = GIS.util.vector.getTransformedFeatureArray(this.layer.features);
 				}
 				
+				this.features = this.layer.features.slice(0);
+				
 				this.loadLegend();
 			}
 		});