Changeset 456

Timestamp:

11/14/08 18:19:21 (2 months ago)

Author:

armin

Message:

patch from T. Raffin for use layers with complex queries that are too long to select results cause maxscaledenom is not used.

Files:

• pmapper/trunk/incphp/map/map.php (modified) (5 diffs)

pmapper/trunk/incphp/map/map.php

@@ -356 +356 @@
-                $mapLay = $this->map->getLayerByName($ai);
-                if ((in_array($mapLay->name, $this->groups) || in_array($mapLay->group, $this->groups)) && checkScale($this->map, $mapLay, $this->map->scale)) {
-   
-   
- 
+       
+       
+
-            }
-        }
@@ -457 +457 @@
-        } elseif ($zoom_type == "zoomgroup") {
-            $this->pmap_zoomgroup();
-
+    
-        }
-    
@@ -625 +625 @@
-        $this->map->setextent($groupExt['minx'], $groupExt['miny'], $groupExt['maxx'], $groupExt['maxy']);
-    }
-    
+
-    
-    /**
@@ -734 +734 @@
-        } else {
-            // Add selected shape to new layer
+
+            // Modified by Thomas RAFFIN (SIRAP)
+            // use layers with complex queries that are too long to select results 
+            // cause maxscaledenom is not used...
+            if ($qLayer->getMetaData("PM_RESULT_DATASUBSTITION") != "") {
+                $olddata = $qLayer->data;
+                $qLayer->set("data", $qLayer->getMetaData("PM_RESULT_DATASUBSTITION"));
+            }
+
-            $qLayer->open();
-            foreach ($shpindexes as $resShpIdx) {
@@ -757 +766 @@
-            
-            $qLayer->close();
+
+            // Modified by Thomas RAFFIN (SIRAP)
+            // reset data tag
+            if (isset($olddata)) {
+                $qLayer->set("data", $olddata);
+            }
+
-        }
-