Refactored (minified) code after GeoJSON support implemented