[Mapbender-commits] r8736 - trunk/mapbender/http/classes
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Fri Nov 8 05:57:08 PST 2013
Author: verenadiewald
Date: 2013-11-08 05:57:08 -0800 (Fri, 08 Nov 2013)
New Revision: 8736
Modified:
trunk/mapbender/http/classes/class_wms.php
Log:
removed spaces in ($element['tag'] )
Modified: trunk/mapbender/http/classes/class_wms.php
===================================================================
--- trunk/mapbender/http/classes/class_wms.php 2013-11-03 19:23:51 UTC (rev 8735)
+++ trunk/mapbender/http/classes/class_wms.php 2013-11-08 13:57:08 UTC (rev 8736)
@@ -585,219 +585,219 @@
$this->gui_wms_featureinfoformat = "";
$this->wms_max_imagesize = 0;
foreach ($values as $element) {
- if(mb_strtoupper($element['tag'] ) == "WMT_MS_CAPABILITIES" && $element['type'] == "open"){
+ if(mb_strtoupper($element['tag']) == "WMT_MS_CAPABILITIES" && $element['type'] == "open"){
$this->wms_version = $element['attributes']['version'];
}
//WMS 1.3.0
- if(mb_strtoupper($element['tag'] ) == "WMS_CAPABILITIES" && $element['type'] == "open"){
+ if(mb_strtoupper($element['tag']) == "WMS_CAPABILITIES" && $element['type'] == "open"){
$this->wms_version = $element['attributes']['version'];
}
- if(mb_strtoupper($element['tag'] ) == "TITLE" && $element['level'] == '3'){
+ if(mb_strtoupper($element['tag']) == "TITLE" && $element['level'] == '3'){
$this->wms_title = $this->stripEndlineAndCarriageReturn($element['value']);
}
- if(mb_strtoupper($element['tag'] ) == "ABSTRACT" && $element['level'] == '3'){
+ if(mb_strtoupper($element['tag']) == "ABSTRACT" && $element['level'] == '3'){
$this->wms_abstract = $this->stripEndlineAndCarriageReturn($element['value']);
}
- if(mb_strtolower($element['tag'] ) == "fees"){
+ if(mb_strtolower($element['tag']) == "fees"){
$this->fees = $element['value'];
}
- if(mb_strtolower($element['tag'] ) == "accessconstraints"){
+ if(mb_strtolower($element['tag']) == "accessconstraints"){
$this->accessconstraints = $element['value'];
}
- if(mb_strtolower($element['tag'] ) == "contactperson"){
+ if(mb_strtolower($element['tag']) == "contactperson"){
$this->contactperson = $element['value'];
}
- if(mb_strtolower($element['tag'] ) == "contactposition"){
+ if(mb_strtolower($element['tag']) == "contactposition"){
$this->contactposition = $element['value'];
}
- if(mb_strtolower($element['tag'] ) == "contactorganization"){
+ if(mb_strtolower($element['tag']) == "contactorganization"){
$this->contactorganization = $element['value'];
}
- if(mb_strtolower($element['tag'] ) == "address"){
+ if(mb_strtolower($element['tag']) == "address"){
$this->address = $element['value'];
}
- if(mb_strtolower($element['tag'] ) == "city"){
+ if(mb_strtolower($element['tag']) == "city"){
$this->city = $element['value'];
}
- if(mb_strtolower($element['tag'] ) == "stateorprovince"){
+ if(mb_strtolower($element['tag']) == "stateorprovince"){
$this->stateorprovince = $element['value'];
}
- if(mb_strtolower($element['tag'] ) == "postcode"){
+ if(mb_strtolower($element['tag']) == "postcode"){
$this->postcode = $element['value'];
}
- if(mb_strtolower($element['tag'] ) == "country"){
+ if(mb_strtolower($element['tag']) == "country"){
$this->country = $element['value'];
}
- if(mb_strtolower($element['tag'] ) == "contactvoicetelephone"){
+ if(mb_strtolower($element['tag']) == "contactvoicetelephone"){
$this->contactvoicetelephone = $element['value'];
}
- if(mb_strtolower($element['tag'] ) == "contactfacsimiletelephone"){
+ if(mb_strtolower($element['tag']) == "contactfacsimiletelephone"){
$this->contactfacsimiletelephone = $element['value'];
}
- if(mb_strtolower($element['tag'] ) == "contactelectronicmailaddress"){
+ if(mb_strtolower($element['tag']) == "contactelectronicmailaddress"){
$this->contactelectronicmailaddress = $element['value'];
}
- if(mb_strtolower($element['tag'] ) == "keyword" && $section != 'layer'){
+ if(mb_strtolower($element['tag']) == "keyword" && $section != 'layer'){
$this->wms_keyword[count($this->wms_keyword)] = $element['value'];
}
/*map section*/
if($this->wms_version == "1.0.0"){
- if(mb_strtoupper($element['tag'] ) == "MAP" && $element['type'] == "open"){
+ if(mb_strtoupper($element['tag']) == "MAP" && $element['type'] == "open"){
$section = "map";
}
- if($section == "map" && mb_strtoupper($element['tag'] ) == "GET"){
+ if($section == "map" && mb_strtoupper($element['tag']) == "GET"){
$this->wms_getmap = $element['attributes'][onlineResource];
}
- if($section == "map" && mb_strtoupper($element['tag'] ) == "FORMAT" && $element['type'] == "open"){
+ if($section == "map" && mb_strtoupper($element['tag']) == "FORMAT" && $element['type'] == "open"){
$format = "map";
}
- if(mb_strtoupper($element['tag'] ) != "FORMAT" && $section == "map" && $format == "map"){
- if (!$this->formatExists("map", trim($element['tag'] ))) {
+ if(mb_strtoupper($element['tag']) != "FORMAT" && $section == "map" && $format == "map"){
+ if (!$this->formatExists("map", trim($element['tag']))) {
$this->data_type[$cnt_format] = "map";
- $this->data_format[$cnt_format] = trim($element['tag'] );
+ $this->data_format[$cnt_format] = trim($element['tag']);
$cnt_format++;
}
}
- if(mb_strtoupper($element['tag'] ) == "FORMAT" && $element['type'] == "close"){
+ if(mb_strtoupper($element['tag']) == "FORMAT" && $element['type'] == "close"){
$format = "";
}
- if(mb_strtoupper($element['tag'] ) == "MAP" && $element['type'] == "close"){
+ if(mb_strtoupper($element['tag']) == "MAP" && $element['type'] == "close"){
$section = "";
}
}
else{
- if(mb_strtoupper($element['tag'] ) == "GETMAP" && $element['type'] == "open"){
+ if(mb_strtoupper($element['tag']) == "GETMAP" && $element['type'] == "open"){
$section = "map";
}
- if($section == "map" && mb_strtoupper($element['tag'] ) == "GET" && $element['type'] == "open"){
+ if($section == "map" && mb_strtoupper($element['tag']) == "GET" && $element['type'] == "open"){
$request = "get";
}
- if($section == "map" && $request == "get" && mb_strtoupper($element['tag'] ) == "ONLINERESOURCE"){
+ if($section == "map" && $request == "get" && mb_strtoupper($element['tag']) == "ONLINERESOURCE"){
$this->wms_getmap = $element['attributes']["xlink:href"];
}
- if($section == "map" && mb_strtoupper($element['tag'] ) == "FORMAT"){
+ if($section == "map" && mb_strtoupper($element['tag']) == "FORMAT"){
if (!$this->formatExists("map", trim($element['value']))) {
$this->data_type[$cnt_format] = "map";
$this->data_format[$cnt_format] = trim($element['value']);
$cnt_format++;
}
}
- if($section == "map" && mb_strtoupper($element['tag'] ) == "GET" && $element['type'] == "close"){
+ if($section == "map" && mb_strtoupper($element['tag']) == "GET" && $element['type'] == "close"){
$request = "";
}
- if(mb_strtoupper($element['tag'] ) == "GETMAP" && $element['type'] == "close"){
+ if(mb_strtoupper($element['tag']) == "GETMAP" && $element['type'] == "close"){
$section = "";
}
}
/*capabilities section*/
if($this->wms_version == "1.0.0"){
- if(mb_strtoupper($element['tag'] ) == "CAPABILITIES" && $element['type'] == "open"){
+ if(mb_strtoupper($element['tag']) == "CAPABILITIES" && $element['type'] == "open"){
$section = "capabilities";
}
- if($section == "capabilities" && mb_strtoupper($element['tag'] ) == "GET"){
+ if($section == "capabilities" && mb_strtoupper($element['tag']) == "GET"){
$this->wms_getcapabilities = $element['attributes'][onlineResource];
}
- if(mb_strtoupper($element['tag'] ) == "CAPABILITIES" && $element['type'] == "close"){
+ if(mb_strtoupper($element['tag']) == "CAPABILITIES" && $element['type'] == "close"){
$section = "";
}
}
else{
- if(mb_strtoupper($element['tag'] ) == "GETCAPABILITIES" && $element['type'] == "open"){
+ if(mb_strtoupper($element['tag']) == "GETCAPABILITIES" && $element['type'] == "open"){
$section = "capabilities";
}
- if($section == "capabilities" && mb_strtoupper($element['tag'] ) == "GET" && $element['type'] == "open"){
+ if($section == "capabilities" && mb_strtoupper($element['tag']) == "GET" && $element['type'] == "open"){
$request = "get";
}
- if($section == "capabilities" && $request == "get" && mb_strtoupper($element['tag'] ) == "ONLINERESOURCE"){
+ if($section == "capabilities" && $request == "get" && mb_strtoupper($element['tag']) == "ONLINERESOURCE"){
$this->wms_getcapabilities = $element['attributes']["xlink:href"];
}
- if($section == "capabilities" && mb_strtoupper($element['tag'] ) == "GET" && $element['type'] == "close"){
+ if($section == "capabilities" && mb_strtoupper($element['tag']) == "GET" && $element['type'] == "close"){
$request = "";
}
- if(mb_strtoupper($element['tag'] ) == "GETCAPABILITIES" && $element['type'] == "close"){
+ if(mb_strtoupper($element['tag']) == "GETCAPABILITIES" && $element['type'] == "close"){
$section = "";
}
}
/*featureInfo section*/
if($this->wms_version == "1.0.0"){
- if(mb_strtoupper($element['tag'] ) == "FEATUREINFO" && $element['type'] == "open"){
+ if(mb_strtoupper($element['tag']) == "FEATUREINFO" && $element['type'] == "open"){
$section = "featureinfo";
}
- if($section == "featureinfo" && mb_strtoupper($element['tag'] ) == "GET"){
+ if($section == "featureinfo" && mb_strtoupper($element['tag']) == "GET"){
$this->wms_getfeatureinfo = $element['attributes'][onlineResource];
}
- if($section == "featureinfo" && mb_strtoupper($element['tag'] ) == "FORMAT" && $element['type'] == "open"){
+ if($section == "featureinfo" && mb_strtoupper($element['tag']) == "FORMAT" && $element['type'] == "open"){
$format = "featureinfo";
}
- if(mb_strtoupper($element['tag'] ) != "FORMAT" && $section == "featureinfo" && $format == "featureinfo"){
- if (!$this->formatExists("featureinfo", trim($element['tag'] ))) {
+ if(mb_strtoupper($element['tag']) != "FORMAT" && $section == "featureinfo" && $format == "featureinfo"){
+ if (!$this->formatExists("featureinfo", trim($element['tag']))) {
$this->data_type[$cnt_format] = "featureinfo";
- $this->data_format[$cnt_format] = trim($element['tag'] );
+ $this->data_format[$cnt_format] = trim($element['tag']);
$cnt_format++;
}
}
- if(mb_strtoupper($element['tag'] ) == "FORMAT" && $element['type'] == "close"){
+ if(mb_strtoupper($element['tag']) == "FORMAT" && $element['type'] == "close"){
$format = "";
}
- if(mb_strtoupper($element['tag'] ) == "FEATUREINFO" && $element['type'] == "close"){
+ if(mb_strtoupper($element['tag']) == "FEATUREINFO" && $element['type'] == "close"){
$section = "";
}
}
else{
- if(mb_strtoupper($element['tag'] ) == "GETFEATUREINFO" && $element['type'] == "open"){
+ if(mb_strtoupper($element['tag']) == "GETFEATUREINFO" && $element['type'] == "open"){
$section = "featureinfo";
}
- if($section == "featureinfo" && mb_strtoupper($element['tag'] ) == "GET" && $element['type'] == "open"){
+ if($section == "featureinfo" && mb_strtoupper($element['tag']) == "GET" && $element['type'] == "open"){
$request = "get";
}
- if($section == "featureinfo" && $request == "get" && mb_strtoupper($element['tag'] ) == "ONLINERESOURCE"){
+ if($section == "featureinfo" && $request == "get" && mb_strtoupper($element['tag']) == "ONLINERESOURCE"){
$this->wms_getfeatureinfo = $element['attributes']["xlink:href"];
}
- if($section == "featureinfo" && mb_strtoupper($element['tag'] ) == "FORMAT"){
+ if($section == "featureinfo" && mb_strtoupper($element['tag']) == "FORMAT"){
if (!$this->formatExists("featureinfo", trim($element['value']))) {
$this->data_type[$cnt_format] = "featureinfo";
$this->data_format[$cnt_format] = trim($element['value']);
$cnt_format++;
}
}
- if($section == "featureinfo" && mb_strtoupper($element['tag'] ) == "GET" && $element['type'] == "close"){
+ if($section == "featureinfo" && mb_strtoupper($element['tag']) == "GET" && $element['type'] == "close"){
$request = "";
}
- if(mb_strtoupper($element['tag'] ) == "GETFEATUREINFO" && $element['type'] == "close"){
+ if(mb_strtoupper($element['tag']) == "GETFEATUREINFO" && $element['type'] == "close"){
$section = "";
}
}
/*exception section*/
if($this->wms_version == "1.0.0"){
- if(mb_strtoupper($element['tag'] ) == "EXCEPTION" && $element['type'] == "open"){
+ if(mb_strtoupper($element['tag']) == "EXCEPTION" && $element['type'] == "open"){
$section = "exception";
}
- if($section == "exception" && mb_strtoupper($element['tag'] ) == "FORMAT" && $element['type'] == "open"){
+ if($section == "exception" && mb_strtoupper($element['tag']) == "FORMAT" && $element['type'] == "open"){
$format = "exception";
}
- if(mb_strtoupper($element['tag'] ) != "FORMAT" && $section == "exception" && $format == "exception"){
+ if(mb_strtoupper($element['tag']) != "FORMAT" && $section == "exception" && $format == "exception"){
$this->data_type[$cnt_format] = "exception";
- $this->data_format[$cnt_format] = trim($element['tag'] );
+ $this->data_format[$cnt_format] = trim($element['tag']);
$cnt_format++;
}
- if($section == "exception" && mb_strtoupper($element['tag'] ) == "FORMAT" && $element['type'] == "close"){
+ if($section == "exception" && mb_strtoupper($element['tag']) == "FORMAT" && $element['type'] == "close"){
$format = "";
}
- if(mb_strtoupper($element['tag'] ) == "EXCEPTION" && $element['type'] == "close"){
+ if(mb_strtoupper($element['tag']) == "EXCEPTION" && $element['type'] == "close"){
$section = "";
}
}
else{
- if(mb_strtoupper($element['tag'] ) == "EXCEPTION" && $element['type'] == "open"){
+ if(mb_strtoupper($element['tag']) == "EXCEPTION" && $element['type'] == "open"){
$section = "exception";
}
- if($section == "exception" && mb_strtoupper($element['tag'] ) == "FORMAT"){
+ if($section == "exception" && mb_strtoupper($element['tag']) == "FORMAT"){
$this->data_type[$cnt_format] = "exception";
$this->data_format[$cnt_format] = trim($element['value']);
$cnt_format++;
}
- if(mb_strtoupper($element['tag'] ) == "EXCEPTION" && $element['type'] == "close"){
+ if(mb_strtoupper($element['tag']) == "EXCEPTION" && $element['type'] == "close"){
$section = "";
}
}
@@ -806,24 +806,24 @@
}
else{
- if(mb_strtoupper($element['tag'] ) == "GETLEGENDGRAPHIC" && $element['type'] == "open"){
+ if(mb_strtoupper($element['tag']) == "GETLEGENDGRAPHIC" && $element['type'] == "open"){
$section = "legend";
}
- if($section == "legend" && mb_strtoupper($element['tag'] ) == "GET" && $element['type'] == "open"){
+ if($section == "legend" && mb_strtoupper($element['tag']) == "GET" && $element['type'] == "open"){
$request = "get";
}
- if($section == "legend" && $request == "get" && mb_strtoupper($element['tag'] ) == "ONLINERESOURCE"){
+ if($section == "legend" && $request == "get" && mb_strtoupper($element['tag']) == "ONLINERESOURCE"){
$this->wms_getlegendurl = $element['attributes']["xlink:href"];
}
- if($section == "legend" && mb_strtoupper($element['tag'] ) == "GET" && $element['type'] == "close"){
+ if($section == "legend" && mb_strtoupper($element['tag']) == "GET" && $element['type'] == "close"){
$request = "";
}
- if(mb_strtoupper($element['tag'] ) == "GETLEGENDGRAPHIC" && $element['type'] == "close"){
+ if(mb_strtoupper($element['tag']) == "GETLEGENDGRAPHIC" && $element['type'] == "close"){
$section = "";
}
}
/* sld section */
- if(mb_strtoupper($element['tag'] ) == "USERDEFINEDSYMBOLIZATION" && $element['type'] == "complete"){
+ if(mb_strtoupper($element['tag']) == "USERDEFINEDSYMBOLIZATION" && $element['type'] == "complete"){
$this->wms_supportsld = $element['attributes']["SupportSLD"];
$this->wms_userlayer = $element['attributes']["UserLayer"];
$this->wms_userstyle = $element['attributes']["UserStyle"];
@@ -831,7 +831,7 @@
}
/*layer section*/
- if(mb_strtoupper($element['tag'] ) == "LAYER"){
+ if(mb_strtoupper($element['tag']) == "LAYER"){
$section = "layer";
if ($element['type'] == "open") {
$cnt_epsg = -1;
@@ -849,7 +849,7 @@
}
}
/* attribution */
- if(mb_strtoupper($element['tag'] ) == "ATTRIBUTION"){
+ if(mb_strtoupper($element['tag']) == "ATTRIBUTION"){
if ($element['type'] == "open") {
$section = "attribution";
}
@@ -858,7 +858,7 @@
}
}
/* styles */
- if(mb_strtoupper($element['tag'] ) == "STYLE"){
+ if(mb_strtoupper($element['tag']) == "STYLE"){
$section = "style";
if($cnt_layer != $layer_style){
$layer_style = $cnt_layer;
@@ -872,37 +872,37 @@
}
}
if($section == "style"){
- if(mb_strtoupper($element['tag'] ) == "NAME"){
+ if(mb_strtoupper($element['tag']) == "NAME"){
$this->objLayer[$cnt_layer]->layer_style[$cnt_styles]["name"] = ($element['value'] ? $element['value'] : 'default');
}
- if(mb_strtoupper($element['tag'] ) == "TITLE"){
+ if(mb_strtoupper($element['tag']) == "TITLE"){
$this->objLayer[$cnt_layer]->layer_style[$cnt_styles]["title"] = ($element['value'] ? $element['value'] : '');
}
- if(mb_strtoupper($element['tag'] ) == "LEGENDURL" && $element['type'] == "open"){
+ if(mb_strtoupper($element['tag']) == "LEGENDURL" && $element['type'] == "open"){
$legendurl = true;
}
- if($legendurl && mb_strtoupper($element['tag'] ) == "FORMAT"){
+ if($legendurl && mb_strtoupper($element['tag']) == "FORMAT"){
$this->objLayer[$cnt_layer]->layer_style[$cnt_styles]["legendurlformat"] = $element['value'];
}
- if($legendurl && mb_strtoupper($element['tag'] ) == "ONLINERESOURCE"){
+ if($legendurl && mb_strtoupper($element['tag']) == "ONLINERESOURCE"){
$this->objLayer[$cnt_layer]->layer_style[$cnt_styles]["legendurl"] = $element['attributes']["xlink:href"];
}
- if(mb_strtoupper($element['tag'] ) == "LEGENDURL" && $element['type'] == "close"){
+ if(mb_strtoupper($element['tag']) == "LEGENDURL" && $element['type'] == "close"){
$legendurl = false;
}
}
/* end of styles */
if($section == "layer"){
- if(mb_strtoupper($element['tag'] ) == "NAME"){
+ if(mb_strtoupper($element['tag']) == "NAME"){
$this->objLayer[$cnt_layer]->layer_name = $element['value'];
}
- if(mb_strtoupper($element['tag'] ) == "TITLE"){
+ if(mb_strtoupper($element['tag']) == "TITLE"){
$this->objLayer[$cnt_layer]->layer_title = $this->stripEndlineAndCarriageReturn($element['value']);
}
- if(mb_strtoupper($element['tag'] ) == "ABSTRACT"){
+ if(mb_strtoupper($element['tag']) == "ABSTRACT"){
$this->objLayer[$cnt_layer]->layer_abstract = $this->stripEndlineAndCarriageReturn($element['value']);
}
- if(mb_strtoupper($element['tag'] ) == "KEYWORD"){
+ if(mb_strtoupper($element['tag']) == "KEYWORD"){
array_push($this->objLayer[$cnt_layer]->layer_keyword, trim($element['value']));
//add vocabulary attribut to keyword object
//read attribute
@@ -938,68 +938,68 @@
}
}
- if(mb_strtoupper($element['tag'] ) == "DATAURL" && $element['type'] == "open"){
+ if(mb_strtoupper($element['tag']) == "DATAURL" && $element['type'] == "open"){
$dataurl = true;
$cnt_dataurl++;
}
- if($dataurl && mb_strtoupper($element['tag'] ) == "FORMAT"){
+ if($dataurl && mb_strtoupper($element['tag']) == "FORMAT"){
$this->objLayer[$cnt_layer]->layer_dataurl[$cnt_dataurl]->format = $element['value'];
}
- if($dataurl && mb_strtoupper($element['tag'] ) == "ONLINERESOURCE"){
+ if($dataurl && mb_strtoupper($element['tag']) == "ONLINERESOURCE"){
$this->objLayer[$cnt_layer]->layer_dataurl[$cnt_dataurl]->href = $element['attributes']["xlink:href"]; //TODO exchange the parsing with a real xml parsing cause namespaces will make problems!
}
- if(mb_strtoupper($element['tag'] ) == "DATAURL" && $element['type'] == "close"){
+ if(mb_strtoupper($element['tag']) == "DATAURL" && $element['type'] == "close"){
$dataurl = false;
}
- if(mb_strtoupper($element['tag'] ) == "METADATAURL" && $element['type'] == "open"){
+ if(mb_strtoupper($element['tag']) == "METADATAURL" && $element['type'] == "open"){
$metadataurl = true;
$cnt_metadataurl++;
$this->objLayer[$cnt_layer]->layer_metadataurl[$cnt_metadataurl]->type = $element['attributes']["type"];
}
- if($metadataurl && mb_strtoupper($element['tag'] ) == "FORMAT"){
+ if($metadataurl && mb_strtoupper($element['tag']) == "FORMAT"){
$this->objLayer[$cnt_layer]->layer_metadataurl[$cnt_metadataurl]->format = $element['value'];
}
- if($metadataurl && mb_strtoupper($element['tag'] ) == "ONLINERESOURCE"){
+ if($metadataurl && mb_strtoupper($element['tag']) == "ONLINERESOURCE"){
$this->objLayer[$cnt_layer]->layer_metadataurl[$cnt_metadataurl]->href = $element['attributes']["xlink:href"];
}
- if(mb_strtoupper($element['tag'] ) == "METADATAURL" && $element['type'] == "close"){
+ if(mb_strtoupper($element['tag']) == "METADATAURL" && $element['type'] == "close"){
$metadataurl = false;
}
- if(mb_strtoupper($element['tag'] ) == "SRS"){
+ if(mb_strtoupper($element['tag']) == "SRS"){
if(count($this->wms_srs) < 1000){ //workaround: only import up to 1000 srs
// unique srs only, see http://www.mapbender.org/index.php/Arrays_with_unique_entries
$this->wms_srs = array_keys(array_flip(array_merge($this->wms_srs, explode(" ", strtoupper($element['value'])))));
}
}
#WMS 1.3.0
- if(mb_strtoupper($element['tag'] ) == "CRS"){
+ if(mb_strtoupper($element['tag']) == "CRS"){
if(count($this->wms_srs) < 1000){ //workaround: only import up to 1000 srs
// unique srs only, see http://www.mapbender.org/index.php/Arrays_with_unique_entries
$this->wms_srs = array_keys(array_flip(array_merge($this->wms_srs, explode(" ", strtoupper($element['value']))))); }
}
#WMS 1.3.0
- if(mb_strtoupper($element['tag'] ) == "EX_GEOGRAPHICBOUNDINGBOX" && $element['type'] == "open"){
+ if(mb_strtoupper($element['tag']) == "EX_GEOGRAPHICBOUNDINGBOX" && $element['type'] == "open"){
$section_bbox = "ex_geographicboundingbox";
}
- if($section_bbox == "ex_geographicboundingbox" && mb_strtoupper($element['tag'] ) == "WESTBOUNDLONGITUDE"){
+ if($section_bbox == "ex_geographicboundingbox" && mb_strtoupper($element['tag']) == "WESTBOUNDLONGITUDE"){
$cnt_epsg++;
$this->objLayer[$cnt_layer]->layer_epsg[$cnt_epsg]["epsg"] = "EPSG:4326";
$this->objLayer[$cnt_layer]->layer_epsg[$cnt_epsg]["minx"] = trim($element['value']);
}
- if($section_bbox == "ex_geographicboundingbox" && mb_strtoupper($element['tag'] ) == "SOUTHBOUNDLATITUDE"){
+ if($section_bbox == "ex_geographicboundingbox" && mb_strtoupper($element['tag']) == "SOUTHBOUNDLATITUDE"){
$this->objLayer[$cnt_layer]->layer_epsg[$cnt_epsg]["miny"] = trim($element['value']);
}
- if($section_bbox == "ex_geographicboundingbox" && mb_strtoupper($element['tag'] ) == "EASTBOUNDLONGITUDE"){
+ if($section_bbox == "ex_geographicboundingbox" && mb_strtoupper($element['tag']) == "EASTBOUNDLONGITUDE"){
$this->objLayer[$cnt_layer]->layer_epsg[$cnt_epsg]["maxx"] = trim($element['value']);
}
- if($section_bbox == "ex_geographicboundingbox" && mb_strtoupper($element['tag'] ) == "NORTHBOUNDLATITUDE"){
+ if($section_bbox == "ex_geographicboundingbox" && mb_strtoupper($element['tag']) == "NORTHBOUNDLATITUDE"){
$this->objLayer[$cnt_layer]->layer_epsg[$cnt_epsg]["maxy"] = trim($element['value']);
}
- if(mb_strtoupper($element['tag'] ) == "GEOGRAPHICBOUNDINGBOX" && $element['type'] == "close"){
+ if(mb_strtoupper($element['tag']) == "GEOGRAPHICBOUNDINGBOX" && $element['type'] == "close"){
$section_bbox = "";
}
- if(mb_strtoupper($element['tag'] ) == "LATLONBOUNDINGBOX"){
+ if(mb_strtoupper($element['tag']) == "LATLONBOUNDINGBOX"){
$cnt_epsg++;
$this->objLayer[$cnt_layer]->layer_epsg[$cnt_epsg]["epsg"] = "EPSG:4326";
$this->objLayer[$cnt_layer]->layer_epsg[$cnt_epsg]["minx"] = $element['attributes']['minx'];
@@ -1007,7 +1007,7 @@
$this->objLayer[$cnt_layer]->layer_epsg[$cnt_epsg]["maxx"] = $element['attributes']['maxx'];
$this->objLayer[$cnt_layer]->layer_epsg[$cnt_epsg]["maxy"] = $element['attributes']['maxy'];
}
- if(mb_strtoupper($element['tag'] ) == "BOUNDINGBOX" && $element['attributes']['SRS'] != "EPSG:4326"
+ if(mb_strtoupper($element['tag']) == "BOUNDINGBOX" && $element['attributes']['SRS'] != "EPSG:4326"
&& $this->wms_version != "1.3.0"){
$cnt_epsg++;
$this->objLayer[$cnt_layer]->layer_epsg[$cnt_epsg]["epsg"] = $element['attributes']['SRS'];
@@ -1021,7 +1021,7 @@
}
}
#WMS 1.3.0
- if(mb_strtoupper($element['tag'] ) == "BOUNDINGBOX" && $element['attributes']['CRS'] == "EPSG:4326"
+ if(mb_strtoupper($element['tag']) == "BOUNDINGBOX" && $element['attributes']['CRS'] == "EPSG:4326"
&& $this->wms_version == "1.3.0"){
$cnt_epsg++;
$this->objLayer[$cnt_layer]->layer_epsg[$cnt_epsg]["epsg"] = $element['attributes']['CRS'];
@@ -1031,7 +1031,7 @@
$this->objLayer[$cnt_layer]->layer_epsg[$cnt_epsg]["maxy"] = $element['attributes']['maxx'];
}
#WMS 1.3.0
- if(mb_strtoupper($element['tag'] ) == "BOUNDINGBOX" && $element['attributes']['CRS'] != "EPSG:4326"
+ if(mb_strtoupper($element['tag']) == "BOUNDINGBOX" && $element['attributes']['CRS'] != "EPSG:4326"
&& $this->wms_version == "1.3.0"){
$cnt_epsg++;
$this->objLayer[$cnt_layer]->layer_epsg[$cnt_epsg]["epsg"] = $element['attributes']['CRS'];
@@ -1054,7 +1054,7 @@
$this->default_epsg = $cnt_epsg;
}
}
- if(mb_strtoupper($element['tag'] ) == "SCALEHINT"){
+ if(mb_strtoupper($element['tag']) == "SCALEHINT"){
if($element['attributes']['max']>1000) $max = 0; else $max = $element['attributes']['max'];
if($element['attributes']['min']>1000) $min = 0; else $min = $element['attributes']['min'];
$this->objLayer[$cnt_layer]->layer_minscale = round(($min * 2004.3976484406788493955738891127));
More information about the Mapbender_commits
mailing list