[Mapbender-commits] r10233 - in trunk/mapbender/http: classes php plugins

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2019-08-30 05:33:32 -0700 (Fri, 30 Aug 2019)
New Revision: 10233

Modified:
   trunk/mapbender/http/classes/class_syncCkan.php
   trunk/mapbender/http/php/mod_linkedDataProxy.php
   trunk/mapbender/http/plugins/mb_button.js
Log:
Fix export of linkedopendata client to ckan and mapviewer position on item page

Modified: trunk/mapbender/http/classes/class_syncCkan.php
===================================================================
--- trunk/mapbender/http/classes/class_syncCkan.php	2019-08-30 11:02:38 UTC (rev 10232)
+++ trunk/mapbender/http/classes/class_syncCkan.php	2019-08-30 12:33:32 UTC (rev 10233)
@@ -1482,7 +1482,7 @@
 	    }
         }
         //for INSPIRE ATOM Feed implementations
-        //$e = new mb_exception("Download options for: ".$metadataUuid);
+	//$e = new mb_exception("Download options for: ".$metadataUuid);
         $downloadOptionsMetadataArray = array();
         $downloadOptionsMetadataArray[0] = $metadataUuid;
         $downloadOptionsJson = getDownloadOptions($downloadOptionsMetadataArray);
@@ -1547,7 +1547,7 @@
 		    //*******************************************************************************************************
 		    // add new linked open data proxy uri if wfs is classified open data!
 		    // 
-		    /*$sql = "SELECT * FROM (SELECT wfs_id, wfs_version FROM wfs INNER JOIN wfs_termsofuse ON wfs_id = fkey_wfs_id AND wfs_id = $1) AS wfs_tou INNER JOIN termsofuse ON fkey_termsofuse_id = termsofuse_id WHERE isopen = 1";
+		    $sql = "SELECT * FROM (SELECT wfs_id, wfs_version, fkey_termsofuse_id FROM wfs INNER JOIN wfs_termsofuse ON wfs_id = fkey_wfs_id AND wfs_id = $1) AS wfs_tou INNER JOIN termsofuse ON fkey_termsofuse_id = termsofuse_id WHERE isopen = 1";
     		    $v = array($option->serviceId);
     		    $t = array($i);
     		    $res = db_prep_query($sql, $v, $t);	
@@ -1584,7 +1584,7 @@
 		            $viewArray[$indexViewArray]['json'] = json_encode($viewJson);
 		            $indexViewArray++;
 		    }	
-		    */
+		    
 		    //*******************************************************************************************************
                     break;
                 case "downloadlink":

Modified: trunk/mapbender/http/php/mod_linkedDataProxy.php
===================================================================
--- trunk/mapbender/http/php/mod_linkedDataProxy.php	2019-08-30 11:02:38 UTC (rev 10232)
+++ trunk/mapbender/http/php/mod_linkedDataProxy.php	2019-08-30 12:33:32 UTC (rev 10233)
@@ -296,6 +296,7 @@
     if ($i == 0) {
         $returnObject->success = false;
         $returnObject->message = "No services found in registry";
+	//$e = new mb_exception("no wfs found");
     } else {
         $returnObject->success = true;
     	$returnObject->message = "Services found in registry!";
@@ -1438,7 +1439,7 @@
 		    $html .= '</div>'.$newline;
 		    $html .= '</div>'.$newline;
 		    if ($map_position == "below_filter") {
-			$html .= '<div id= "map"></div>'.$newline;
+			$html .= '<div id="map"></div>'.$newline;
 		    }
 }
 		    //Navigation elements
@@ -1508,6 +1509,9 @@
 			    $html .= $nav;
                     } else {
 			//only one feature is found!
+			if ($map_position == "below_filter") {
+			    $html .= '<div id="map"></div>'.$newline;
+		    	}
 			$feature = $returnObject;
 			$html .= '                    <div  itemscope itemtype="http://schema.org/Place">'.$newline;
 			$html .= '                        <h1 itemprop="name">'.$feature->id.'</h1>'.$newline;

Modified: trunk/mapbender/http/plugins/mb_button.js
===================================================================
--- trunk/mapbender/http/plugins/mb_button.js	2019-08-30 11:02:38 UTC (rev 10232)
+++ trunk/mapbender/http/plugins/mb_button.js	2019-08-30 12:33:32 UTC (rev 10233)
@@ -69,6 +69,7 @@
         });
 
         var openDialog = function () {
+alert("try to open dialog: o.target: "+JSON.stringify(o));
 		dialog.dialog("open");
 		dialog.dialog({ height: options.dialogHeight });
 		dialog.dialog({ width: options.dialogWidth });