Unverified Commit 2554ec4e authored by User expired's avatar User expired
Browse files

fixing problem with marker-number in combination with webpack

parent 7ae867ba
Upcoming version:
-----------------
- fixing problem with marker-number in combination with webpack (Nikolaus Krismer)
- improved error messages (Nikolaus Krismer)
- fixed hill shading and meanCalculator (skewness part) (Nikolaus Krismer)
- fixed time invariant isochrone computation (Nikolaus Krismer)
......
......@@ -24,7 +24,7 @@ import at.uibk.dbis.isomap.service.dto.IResponse;
import at.uibk.dbis.isomap.service.dto.ResponseIsochrone;
import at.uibk.dbis.isomap.web.resolver.DtoResolver;
class AbstractJsonApi {
abstract class AbstractJsonApi {
private static final Logger LOGGER = LogManager.getLogger(AbstractJsonApi.class);
private static final String EXTENSION_JSON = ".json";
private static final String EXTENSION_GEOJSON = EXTENSION_JSON;
......@@ -35,7 +35,7 @@ class AbstractJsonApi {
RESPONSE("build/responses");
private final String dir;
private TraceDirectory(final String dir) {
TraceDirectory(final String dir) {
this.dir = dir;
}
......
......@@ -80,15 +80,16 @@ div.ui-widget-overlay {
line-height: 26px !important;
}
.leaflet-marker-icon.leaflet-marker-icon-number {
background: transparent;
.leaflet-marker-icon.marker-icon-number {
background-color: transparent;
background-image: url('../images/marker-number.png');
border: none;
}
.leaflet-marker-icon.leaflet-marker-icon-number .number {
.leaflet-marker-icon.marker-icon-number .number {
position: relative;
top: -37px;
font-size: 12px;
top: 5px;
font-size: 11px;
width: 25px;
text-align: center;
}
......
define(['leaflet'], function(L) {
L.NumberedMarker = L.Icon.extend({
L.NumberedMarker = L.DivIcon.extend({
options : {
iconUrl: 'images/marker-number.png',
number: '',
shadowUrl: null,
iconSize: new L.Point(25, 41),
iconAnchor: new L.Point(13, 41),
popupAnchor : new L.Point(0, -33),
/*
* iconAnchor: (Point) popupAnchor: (Point)
*/
className: 'leaflet-div-icon'
className: 'leaflet-div-icon marker-icon-number'
},
createIcon : function() {
var div = document.createElement('div'),
img = this._createImg(this.options['iconUrl']),
numdiv = document.createElement('div');
options = this.options;
numdiv.setAttribute('class', 'number');
numdiv.innerHTML = this.options['number'] || '';
div.appendChild(img);
div.innerHTML = options.html !== false ? options.html : '';
div.appendChild(numdiv);
if (options.bgPos) {
var bgPos = point(options.bgPos);
div.style.backgroundPosition = (-bgPos.x) + 'px ' + (-bgPos.y) + 'px';
}
this._setIconStyles(div, 'icon');
div.setAttribute('class', div.className + ' leaflet-marker-icon-number');
return div;
},
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment