No need to quote properties in vector-labels example

This commit is contained in:
Tom Payne
2014-03-23 19:14:36 +01:00
parent 9a6b502960
commit 06469ede50

View File

@@ -13,56 +13,56 @@ goog.require('ol.style.Text');
var myDom = { var myDom = {
'points': { points: {
'text': document.getElementById('points-text'), text: document.getElementById('points-text'),
'align': document.getElementById('points-align'), align: document.getElementById('points-align'),
'baseline': document.getElementById('points-baseline'), baseline: document.getElementById('points-baseline'),
'rotation': document.getElementById('points-rotation'), rotation: document.getElementById('points-rotation'),
'font': document.getElementById('points-font'), font: document.getElementById('points-font'),
'weight': document.getElementById('points-weight'), weight: document.getElementById('points-weight'),
'size': document.getElementById('points-size'), size: document.getElementById('points-size'),
'offset-x': document.getElementById('points-offset-x'), offsetX: document.getElementById('points-offset-x'),
'offset-y': document.getElementById('points-offset-y'), offsetY: document.getElementById('points-offset-y'),
'color': document.getElementById('points-color'), color: document.getElementById('points-color'),
'outline': document.getElementById('points-outline'), outline: document.getElementById('points-outline'),
'outline-width': document.getElementById('points-outline-width'), outlineWidth: document.getElementById('points-outline-width'),
'maxreso': document.getElementById('points-maxreso') maxreso: document.getElementById('points-maxreso')
}, },
'lines': { lines: {
'text': document.getElementById('lines-text'), text: document.getElementById('lines-text'),
'align': document.getElementById('lines-align'), align: document.getElementById('lines-align'),
'baseline': document.getElementById('lines-baseline'), baseline: document.getElementById('lines-baseline'),
'rotation': document.getElementById('lines-rotation'), rotation: document.getElementById('lines-rotation'),
'font': document.getElementById('lines-font'), font: document.getElementById('lines-font'),
'weight': document.getElementById('lines-weight'), weight: document.getElementById('lines-weight'),
'size': document.getElementById('lines-size'), size: document.getElementById('lines-size'),
'offset-x': document.getElementById('lines-offset-x'), offsetX: document.getElementById('lines-offset-x'),
'offset-y': document.getElementById('lines-offset-y'), offsetY: document.getElementById('lines-offset-y'),
'color': document.getElementById('lines-color'), color: document.getElementById('lines-color'),
'outline': document.getElementById('lines-outline'), outline: document.getElementById('lines-outline'),
'outline-width': document.getElementById('lines-outline-width'), outlineWidth: document.getElementById('lines-outline-width'),
'maxreso': document.getElementById('lines-maxreso') maxreso: document.getElementById('lines-maxreso')
}, },
'polygons': { polygons: {
'text': document.getElementById('polygons-text'), text: document.getElementById('polygons-text'),
'align': document.getElementById('polygons-align'), align: document.getElementById('polygons-align'),
'baseline': document.getElementById('polygons-baseline'), baseline: document.getElementById('polygons-baseline'),
'rotation': document.getElementById('polygons-rotation'), rotation: document.getElementById('polygons-rotation'),
'font': document.getElementById('polygons-font'), font: document.getElementById('polygons-font'),
'weight': document.getElementById('polygons-weight'), weight: document.getElementById('polygons-weight'),
'size': document.getElementById('polygons-size'), size: document.getElementById('polygons-size'),
'offset-x': document.getElementById('polygons-offset-x'), offsetX: document.getElementById('polygons-offset-x'),
'offset-y': document.getElementById('polygons-offset-y'), offsetY: document.getElementById('polygons-offset-y'),
'color': document.getElementById('polygons-color'), color: document.getElementById('polygons-color'),
'outline': document.getElementById('polygons-outline'), outline: document.getElementById('polygons-outline'),
'outline-width': document.getElementById('polygons-outline-width'), outlineWidth: document.getElementById('polygons-outline-width'),
'maxreso': document.getElementById('polygons-maxreso') maxreso: document.getElementById('polygons-maxreso')
} }
}; };
var getText = function(feature, resolution, dom) { var getText = function(feature, resolution, dom) {
var type = dom['text'].value; var type = dom.text.value;
var maxResolution = dom['maxreso'].value; var maxResolution = dom.maxreso.value;
var text = feature.getProperties().name; var text = feature.getProperties().name;
if (resolution > maxResolution) { if (resolution > maxResolution) {
@@ -80,17 +80,17 @@ var getText = function(feature, resolution, dom) {
var createTextStyle = function(feature, resolution, dom) { var createTextStyle = function(feature, resolution, dom) {
var align = dom['align'].value; var align = dom.align.value;
var baseline = dom['baseline'].value; var baseline = dom.baseline.value;
var size = dom['size'].value; var size = dom.size.value;
var offsetX = parseInt(dom['offset-x'].value, 10); var offsetX = parseInt(dom.offsetX.value, 10);
var offsetY = parseInt(dom['offset-y'].value, 10); var offsetY = parseInt(dom.offsetY.value, 10);
var weight = dom['weight'].value; var weight = dom.weight.value;
var rotation = parseFloat(dom['rotation'].value); var rotation = parseFloat(dom.rotation.value);
var font = weight + ' ' + size + ' ' + dom['font'].value; var font = weight + ' ' + size + ' ' + dom.font.value;
var fillColor = dom['color'].value; var fillColor = dom.color.value;
var outlineColor = dom['outline'].value; var outlineColor = dom.outline.value;
var outlineWidth = parseInt(dom['outline-width'].value, 10); var outlineWidth = parseInt(dom.outlineWidth.value, 10);
return new ol.style.Text({ return new ol.style.Text({
textAlign: align, textAlign: align,