Merge branch 'geometry-mapping' of https://github.com/terraframe/geod…

…ashboard into geometry-mapping made color pickers scroll with page
terraframe · Jun 19, 2015 · 6eb1e8c · 6eb1e8c
2 parents a127cad + e0a1f1a
commit 6eb1e8c
Showing 1 changed file with 6 additions and 11 deletions.
diff --git a/geodashboard-server/src/main/java-gen/stub/com/runwaysdk/geodashboard/Dashboard.java b/geodashboard-server/src/main/java-gen/stub/com/runwaysdk/geodashboard/Dashboard.java
@@ -66,6 +66,7 @@
 import com.runwaysdk.system.gis.geo.GeoEntity;
 import com.runwaysdk.system.gis.geo.GeoEntityQuery;
 import com.runwaysdk.system.gis.geo.GeoNode;
+import com.runwaysdk.system.gis.geo.GeoNodeQuery;
 import com.runwaysdk.system.gis.geo.Universal;
 import com.runwaysdk.system.metadata.MdAttribute;
 import com.runwaysdk.system.metadata.MdClass;
@@ -916,24 +917,18 @@ public GeoNode[] getGeoNodes(MdAttributeDAOIF thematicAttribute)
     MetadataGeoNodeQuery mgQuery = new MetadataGeoNodeQuery(factory);
     mgQuery.WHERE(mgQuery.getParent().EQ(mwQuery));
 
-    OIterator<? extends MetadataGeoNode> iterator = mgQuery.getIterator();
+    GeoNodeQuery gnQuery = new GeoNodeQuery(factory);
+    gnQuery.WHERE(gnQuery.EQ(mgQuery.getChild()));
 
-    Set<GeoNode> nodes = new TreeSet<GeoNode>(new Comparator<GeoNode>()
-    {
+    OIterator<? extends GeoNode> iterator = gnQuery.getIterator();
 
-      @Override
-      public int compare(GeoNode o1, GeoNode o2)
-      {
-        return o1.getId().compareTo(o2.getId());
-      }
-    });
+    List<GeoNode> nodes = new LinkedList<GeoNode>();
 
     try
     {
       while (iterator.hasNext())
       {
-        MetadataGeoNode metadata = iterator.next();
-        GeoNode geoNode = metadata.getChild();
+        GeoNode geoNode = iterator.next();
 
         nodes.add(geoNode);
       }