[Mapbender-commits] r9348 - in trunk/mapbender/http: javascripts plugins
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Tue Jan 12 10:43:19 PST 2016
Author: armin11
Date: 2016-01-12 10:43:19 -0800 (Tue, 12 Jan 2016)
New Revision: 9348
Modified:
trunk/mapbender/http/javascripts/mb_downloadFeedClient.php
trunk/mapbender/http/plugins/mb_downloadFeedClient.php
Log:
Bugfixes ATOM Feed Client
Modified: trunk/mapbender/http/javascripts/mb_downloadFeedClient.php
===================================================================
--- trunk/mapbender/http/javascripts/mb_downloadFeedClient.php 2016-01-12 15:50:37 UTC (rev 9347)
+++ trunk/mapbender/http/javascripts/mb_downloadFeedClient.php 2016-01-12 18:43:19 UTC (rev 9348)
@@ -55,15 +55,11 @@
function init(){
//var form = document.getElementById("service_feed_form");
-
-
-
//generate 2 Mapframes
//add active class to dataset info before showing map, afterwords remove it!
$('#dataset_info').toggleClass('active');
mapframe_dataset_list = new OpenLayers.Map('mapframe_dataset_list');
$('#dataset_info').toggleClass('active');
-
$('#representations').toggleClass('active');
mapframe_file_list = new OpenLayers.Map('mapframe_file_list');
$('#representations').toggleClass('active');
@@ -81,7 +77,6 @@
bboxFiles = new OpenLayers.Layer.Vector("File bounding boxes");
mapframe_dataset_list.addLayers([<?php echo $addBackgroundLayerUpper; ?>]);
mapframe_dataset_list.addLayers([bboxDataset]);
-
mapframe_dataset_list.addControl(new OpenLayers.Control.MousePosition());
mapframe_dataset_list.addControl(new OpenLayers.Control.PanPanel());
mapframe_file_list.addLayers([<?php echo $addBackgroundLayerLower; ?>]);
@@ -155,7 +150,7 @@
//$("#parse_service_feed_modal").toggle();
$("#loading_image_dataset").css("display","none");
//select tab
- $('#mytabs a[href="#representations"]').tab('show');
+ //$('#mytabs a[href="#representations"]').tab('show');
showDatasetEntryList(result, id);
}
@@ -172,6 +167,8 @@
$("#representation_info").css("display","none");
$("#dataset_information").css("display","none");
$("#capabilities_hybrid").css("display","none");
+ $("#label_capabilities_hybrid").css("display","none");
+ $("#label_dataset_select").css("display","none");
//change size of outer fieldset
$("#client").css("height","450px");
$("#download_link_list").remove();
@@ -203,8 +200,11 @@
for(var i=0; i<featureCollection.features.length; ++i) {
//fill in first title, rights and abstract in fields
if (i == id) {
+ $('#dataset_title').empty();
$('#dataset_title').append(featureCollection.features[i].properties.title);
+ $('#dataset_rights').empty();
$('#dataset_rights').append(featureCollection.features[i].properties.rights);
+ $('#dataset_abstract').empty();
$('#dataset_abstract').append(featureCollection.features[i].properties.summary);
//add capabilities anchor
identifierAnchor = $(document.createElement('a')).appendTo('#capabilities_hybrid');
@@ -214,6 +214,7 @@
//show hybrid link only if it is there
if (typeof featureCollection.features[i].properties.capabilitiesLink !== 'undefined' && featureCollection.features[i].properties.capabilitiesLink !== '' && featureCollection.features[i].properties.capabilitiesLink !== null) {
$("#capabilities_hybrid").css("display","block");
+ $("#label_capabilities_hybrid").css("display","block");
}
//add identifier anchor
identifierAnchor = $(document.createElement('a')).appendTo('#dataset_identifier');
@@ -231,6 +232,7 @@
//datasetSelect.attr({'data-width':'auto'});
//$('.selectpicker').selectpicker('render');
$("#dataset_information").css("display","block");
+ $("#label_dataset_select").css("display","block");
//preselect option
$("#dataset_select option[optionid='" + id + "']").attr("selected","selected");
$('#dataset_select').bind('change', function() {
@@ -240,7 +242,7 @@
showDatasetList(featureCollection,optionSelected);
method = "getDatasetFeedObjectFromUrl";
data = $this.val();
- resetForm();
+ //resetForm();
callServer(data,method);
});
method = "getDatasetFeedObjectFromUrl";
Modified: trunk/mapbender/http/plugins/mb_downloadFeedClient.php
===================================================================
--- trunk/mapbender/http/plugins/mb_downloadFeedClient.php 2016-01-12 15:50:37 UTC (rev 9347)
+++ trunk/mapbender/http/plugins/mb_downloadFeedClient.php 2016-01-12 18:43:19 UTC (rev 9348)
@@ -100,7 +100,7 @@
<script src="../extensions/bootstrap-3.3.6-dist/js/bootstrap.min.js"></script>
<script src="../extensions/bootstrap-select-1.9.3/dist/js/bootstrap-select.min.js"></script>
<script src="../extensions/bootstrap-select-1.9.3/dist/js/i18n/defaults-de_DE.js"></script>
-<script src="../javascripts/mb_downloadFeedClient1.php"></script>
+<script src="../javascripts/mb_downloadFeedClient.php"></script>
</head>
<body onload="init()">
<!-- Navbar -->
@@ -143,14 +143,14 @@
</div>
</div>
</div>-->
-<div id="loading_image_service" style="display: none;"><p><img class="inspire_loading" src="../img/inspire_tr_36.png" style="margin-left: auto; margin-right: auto;"/>Loading Service Feed ...</p></div>
+<div id="loading_image_service" style="display: none;"><p><img class="inspire_loading" src="../img/inspire_tr_36.png" style="margin-left: auto; margin-right: auto;"/><?php echo _mb("Loading Service Feed ...");?></p></div>
<!-- <button class="btn btn-primary" type="button" id="stop_parsing"><?php echo _mb("reset");?></button> -->
-<div id="loading_image_dataset" style="display: none;"><p><img class="inspire_loading" src="../img/inspire_tr_36.png" style="margin-left: auto; margin-right: auto;"/>Loading Dataset Feed ...</p></div>
+<div id="loading_image_dataset" style="display: none;"><p><img class="inspire_loading" src="../img/inspire_tr_36.png" style="margin-left: auto; margin-right: auto;"/><?php echo _mb("Loading Dataset Feed ...");?></p></div>
<!-- Tabs-Navs -->
<ul class="nav nav-tabs" role="tablist" id="mytabs">
<li role="presentation" class="active"><a href="#input_feed_url" role="tab" data-toggle="tab"><?php echo _mb("Url to feed");?></a></li>
- <li role="presentation"><a href="#dataset_info" role="tab" data-toggle="tab"><?php echo _mb("Available datasets");?></a></li>
+ <li role="presentation"><a href="#dataset_info" role="tab" data-toggle="tab"><?php echo _mb("Datasets");?></a></li>
<li role="presentation"><a href="#representations" role="tab" data-toggle="tab"><?php echo _mb("Access to representations");?></a></li>
</ul>
<!-- Tab-Inhalte -->
@@ -163,13 +163,26 @@
<button class="btn btn-primary" type="button" id="download_feed_button">
<?php echo _mb("Get feed content");?>
</button>
+ <p>
+ <label for="example_feeds"><?php echo _mb("Example feeds");?>:</label>
+ <ul id="example_feeds">
+ <li>http://www.geoportal.rlp.de/mapbender/php/mod_inspireDownloadFeed.php?id=2b009ae4-aa3e-ff21-870b-49846d9561b2&type=SERVICE&generateFrom=wmslayer&layerid=30694</li>
+ <li>http://www.geoportal.rlp.de/mapbender/php/mod_inspireDownloadFeed.php?id=c2019e4f-3a3b-1caf-5c61-98a4343bf249&type=SERVICE&generateFrom=wfs&wfsid=216</li>
+ <li>http://geo.noe.gv.at/inspire-download/download_service_feed.xml</li>
+ <li>http://ole.e-steiermark.com/inspire/DownloadServiceFeed.xml</li>
+ <li>https://www.geoportal.ie/geoportal/download/ProtectedSites_SPA/npws-inspire-protected-sites-special-protection-areas.atom.en.xml</li>
+ </ul>
+ </p>
<!--<input type="button" title="Get Feed" id="download_feed_button" value="<?php echo _mb("Get feed content");?>"/>-->
</form>
</p>
</div>
<div role="tabpanel" class="tab-pane" id="dataset_info">
- <div id="dataset_list">
- <div id="dataset_select"></div>
+ <div id="dataset_list">
+ <p>
+ <label for="dataset_select" id="label_dataset_select"><?php echo _mb("Available datasets");?>:</label>
+ <div id="dataset_select"></div>
+ </p>
</div>
<br>
<div id="mapframe_dataset_list"></div>
@@ -184,8 +197,8 @@
<p readonly="readonly" name="dataset_abstract" id="dataset_abstract"></p>
</p>
<p>
- <!--<label for="resource_identifier"><?php echo _mb("Resource identifier");?>:</label>-->
- <div id="dataset_identifier"><?php echo _mb("Resource identifier (linkage to metadata)");?>:<br></div>
+ <label for="resource_identifier"><?php echo _mb("Resource identifier (linkage to metadata)");?>:</label>
+ <p readonly="readonly" id="dataset_identifier"></p>
</p>
<p>
<label for="dataset_rights"><?php echo _mb("Rights");?>:</label>
@@ -197,7 +210,10 @@
</div>
</div>
<div role="tabpanel" class="tab-pane" id="representations">
- <div id="capabilities_hybrid"><?php echo _mb("Capabilities (WFS-hybrid)");?>:<br></div>
+ <p>
+ <label for="capabilities_hybrid" id="label_capabilities_hybrid"><?php echo _mb("Capabilities (WFS-hybrid)");?>:</label>
+ <div id="capabilities_hybrid"></div>
+ </p>
<div id="representation_select">
<p>
<label for="representations"><?php echo _mb("Available representations");?>:</label>
More information about the Mapbender_commits
mailing list