Skip to content
Permalink
Browse files

Fix

  • Loading branch information...
uprel committed May 7, 2019
1 parent 335c165 commit 634cafdb7b2f598c655de5efca3973f874fd96bf
Showing with 37 additions and 23 deletions.
  1. +1 −1 client/site/js/GeocodingSearchCombo.js
  2. +32 −22 client_mobile/src/gui.js
  3. +4 −0 client_mobile/src/viewer.css
@@ -136,7 +136,7 @@ GeoExt.ux.GeocodingSearchCombo = Ext.extend(Ext.form.ComboBox, {
this.highlightLayer = this.map.getLayersByName(this.highlightLayerName)[0];
}


this.listWidth = this.width;

//setup for mapbox params
var params = {
@@ -264,10 +264,15 @@ Gui.loadLayers = function (data) {
return;
}


// add layer
html += '<label>';
html += '<input type="' + type + '" ';
//group layer + legend
html += '<div data-role="collapsible" data-theme="c"';
html += ' data-iconpos="right" data-collapsed-icon="arrow-r" data-expanded-icon="arrow-d" data-groupcheckbox="true"';
html += '>';
html += '<h3>' + node.name + '</h3>';

// add layer, but hidden, checkbox in group above will control layer on/off
html += '<label style="display:none">';
html += '<input style="display:none" type="' + type + '" ';
if (parent != null) {
// prevent auto-enhancement by jQuery Mobile if layer belongs to a group
html += 'data-role="none" ';
@@ -278,25 +283,30 @@ Gui.loadLayers = function (data) {
html += 'checked ';
}
html += '>' + layer.toclayertitle;
html += '</input>';
html += '</label>';
//var legendUrl = Map.topics[Map.topic].wms_url +
// "?SERVICE=WMS"+
// "&VERSION=1.3.0"+
// "&REQUEST=GetLegendGraphics"+
// "&FORMAT=image/png"+
// "&EXCEPTIONS=application/vnd.ogc.se_inimage"+
// "&BOXSPACE=1"+
// "&LAYERSPACE=2"+
// "&SYMBOLSPACE=1"+
// "&SYMBOLHEIGHT=2"+
// "&LAYERFONTSIZE=8"+
// "&ITEMFONTSIZE=8"+
// "&LAYERTITLE=FALSE"+
// "&LAYERTITLESPACE=0"+
// "&TRANSPARENT=TRUE"+
// "&LAYERS="+encodeURIComponent(layer.id)+
// "&DPI="+encodeURIComponent(Config.map.dpi);
//html+='<img data-layer="'+layer.id+'" src="' + legendUrl + '"';

var legendUrl = Map.topics[Map.topic].wms_url +
"?SERVICE=WMS"+
"&VERSION=1.3.0"+
"&REQUEST=GetLegendGraphics"+
"&FORMAT=image/png"+
"&EXCEPTIONS=application/vnd.ogc.se_inimage"+
"&BOXSPACE=1"+
"&LAYERSPACE=2"+
"&SYMBOLSPACE=1"+
"&SYMBOLHEIGHT=2"+
"&LAYERFONTSIZE=8"+
"&ITEMFONTSIZE=8"+
"&LAYERTITLE=FALSE"+
"&LAYERTITLESPACE=0"+
"&TRANSPARENT=TRUE"+
"&LAYERS="+encodeURIComponent(layer.id)+
"&DPI="+encodeURIComponent(Config.map.dpi);
html+='<img data-layer="'+layer.id+'" src="' + legendUrl + '"';
html += '</img>';

html += '</div>';
//if (!layer.visini) {
// html += '" style="display:none;" ';
//}
@@ -335,6 +335,10 @@
padding-left: 48px;
}

.ui-collapsible-heading .ui-btn-icon-right .ui-btn-inner {
padding-right: 26px;
}

.btn-icon-text.ui-btn-icon-left .ui-btn-inner .ui-icon {
background-color: transparent;
background-size: 32px 32px;

0 comments on commit 634cafd

Please sign in to comment.
You can’t perform that action at this time.