Upgrade to Mappable

.editorconfig

@@ -0,0 +1,35 @@
+# For more information about the properties used in
+# this file, please see the EditorConfig documentation:
+# http://editorconfig.org/
+
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 4
+indent_style = tab
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+# Docs say 80 ideally, 100 ok, no more than 120
+# http://doc.silverstripe.org/en/getting_started/coding_conventions/
+max_line_length = 100
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.yml]
+indent_size = 2
+indent_style = space
+
+#PSR 2
+[**.php]
+indent_style = space
+indent_size = 4
+
+[{.travis.yml,package.json}]
+# The indent size used in the `package.json` file cannot be changed
+# https://github.com/npm/npm/pull/3180#issuecomment-16336516
+indent_size = 2
+indent_style = space

.gitignore

@@ -0,0 +1 @@
+node_modules

.scrutinizer.yml

@@ -0,0 +1,26 @@
+inherit: true
+
+#Copied from https://www.adayinthelifeof.nl/2013/11/20/external-code-coverage-with-travis-scrutinizer/
+tools:
+    external_code_coverage:
+      timeout: 600
+    php_code_sniffer:
+      config:
+        standard: PSR2
+    php_cs_fixer:
+      extensions:
+        # Default:
+        - php
+      fixers: []
+      enabled: false
+      filter:
+            paths: [tests/*,code/*]
+            excluded_paths: []
+coding_style:
+  php:
+    indentation:
+      general:
+        use_tabs: false
+
+filter:
+    paths: [tests/*,code/*]

.travis.yml

@@ -0,0 +1,71 @@
+language: php
+
+sudo: false
+
+addons:
+  apt:
+    packages:
+      - tidy
+
+before_install:
+  - pip install --user codecov
+
+env:
+  global:
+    - DB=MYSQL CORE_RELEASE=3.1
+    - MODULE_PATH=mappable
+
+matrix:
+  allow_failures:
+    - php: hhvm-nightly
+  include:
+    - php: 5.6
+      env: DB=MYSQL
+    - php: 5.6
+      env: DB=PGSQL
+    - php: 5.6
+      env: DB=SQLITE
+    - php: 5.5
+      env: DB=MYSQL
+    - php: 5.4
+      env: DB=MYSQL
+    - php: 5.3
+      env: DB=MYSQL
+    - php: hhvm
+      env: DB=MYSQL
+    - php: 5.6
+      env: DB=MYSQL CORE_RELEASE=3.2
+    - php: 5.6
+      env: DB=PGSQL CORE_RELEASE=3.2
+    - php: 5.6
+      env: DB=SQLITE CORE_RELEASE=3.2
+    - php: 5.5
+      env: DB=MYSQL CORE_RELEASE=3.2
+    - php: 5.4
+      env: DB=MYSQL CORE_RELEASE=3.2
+    - php: 5.3
+      env: DB=MYSQL CORE_RELEASE=3.2
+    - php: hhvm
+      env: DB=MYSQL CORE_RELEASE=3.2
+
+
+before_script:
+  - phpenv rehash
+  - composer self-update || true
+  - git clone git://github.com/silverstripe-labs/silverstripe-travis-support.git ~/travis-support
+  - php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss
+  - cd ~/builds/ss
+  - composer require satooshi/php-coveralls
+
+script:
+  - vendor/bin/phpunit --coverage-clover=coverage.clover -c $MODULE_PATH/phpunit.xml $MODULE_PATH/tests/
+
+after_success:
+  - cp coverage.clover ~/coverage.xml
+  - mkdir -p build/logs
+  - travis_retry php vendor/bin/coveralls -v --coverage_clover coverage.clover
+  - mv coverage.clover ~/build/$TRAVIS_REPO_SLUG/
+  - cd ~/build/$TRAVIS_REPO_SLUG
+  - wget https://scrutinizer-ci.com/ocular.phar
+  - php ocular.phar code-coverage:upload --format=php-clover coverage.clover
+  - codecov

CHANGELOG.md

@@ -0,0 +1,48 @@
+# Change Log
+
+## [3.2.1](https://github.com/gordonbanderson/Mappable/tree/3.2.1) (2016-01-05)
+[Full Changelog](https://github.com/gordonbanderson/Mappable/compare/3.2.0...3.2.1)
+
+## [3.2.0](https://github.com/gordonbanderson/Mappable/tree/3.2.0) (2016-01-05)
+[Full Changelog](https://github.com/gordonbanderson/Mappable/compare/3.1.0...3.2.0)
+
+**Closed issues:**
+
+- Icon Width and Height Not Used [\#42](https://github.com/gordonbanderson/Mappable/issues/42)
+- Can not disable clusterer [\#29](https://github.com/gordonbanderson/Mappable/issues/29)
+- Multiple markers on one map [\#28](https://github.com/gordonbanderson/Mappable/issues/28)
+- Move Points of Interest to a Separate Module [\#27](https://github.com/gordonbanderson/Mappable/issues/27)
+- Autozoom Overly Enabled for Map Extension when Layers Extensions Also Enabled [\#26](https://github.com/gordonbanderson/Mappable/issues/26)
+- Change to Unobtrusive JavaScript [\#25](https://github.com/gordonbanderson/Mappable/issues/25)
+- StaticMap doesn't respect getMappableMapPin [\#22](https://github.com/gordonbanderson/Mappable/issues/22)
+- Ensure That Map Extension Returns a String, not an Image File [\#19](https://github.com/gordonbanderson/Mappable/issues/19)
+- Ensure Clusterer Settings Used [\#16](https://github.com/gordonbanderson/Mappable/issues/16)
+- refactor maputil.js [\#15](https://github.com/gordonbanderson/Mappable/issues/15)
+- Implement Guide Markers for POIs [\#12](https://github.com/gordonbanderson/Mappable/issues/12)
+- Combine and Minify JavaScript Files [\#11](https://github.com/gordonbanderson/Mappable/issues/11)
+- SilverStripe Code Guidline Compliance [\#10](https://github.com/gordonbanderson/Mappable/issues/10)
+- Add Escape Button Option to Close Full Screen [\#9](https://github.com/gordonbanderson/Mappable/issues/9)
+- Clusterer: merge info windows for cluster [\#5](https://github.com/gordonbanderson/Mappable/issues/5)
+- Apparent debug text showing in map editing interface [\#4](https://github.com/gordonbanderson/Mappable/issues/4)
+
+**Merged pull requests:**
+
+- Convert to PSR2 [\#45](https://github.com/gordonbanderson/Mappable/pull/45) ([gordonbanderson](https://github.com/gordonbanderson))
+- Scrutinizer Auto-Fixes [\#43](https://github.com/gordonbanderson/Mappable/pull/43) ([scrutinizer-auto-fixer](https://github.com/scrutinizer-auto-fixer))
+- Scrutinizer Auto-Fixes [\#39](https://github.com/gordonbanderson/Mappable/pull/39) ([scrutinizer-auto-fixer](https://github.com/scrutinizer-auto-fixer))
+- Scrutinizer Auto-Fixes [\#38](https://github.com/gordonbanderson/Mappable/pull/38) ([scrutinizer-auto-fixer](https://github.com/scrutinizer-auto-fixer))
+- Scrutinizer Auto-Fixes [\#36](https://github.com/gordonbanderson/Mappable/pull/36) ([scrutinizer-auto-fixer](https://github.com/scrutinizer-auto-fixer))
+- Scrutinizer Auto-Fixes [\#34](https://github.com/gordonbanderson/Mappable/pull/34) ([scrutinizer-auto-fixer](https://github.com/scrutinizer-auto-fixer))
+- Scrutinizer Auto-Fixes [\#33](https://github.com/gordonbanderson/Mappable/pull/33) ([scrutinizer-auto-fixer](https://github.com/scrutinizer-auto-fixer))
+- Scrutinizer Auto-Fixes [\#32](https://github.com/gordonbanderson/Mappable/pull/32) ([scrutinizer-auto-fixer](https://github.com/scrutinizer-auto-fixer))
+- Scrutinizer Auto-Fixes [\#31](https://github.com/gordonbanderson/Mappable/pull/31) ([scrutinizer-auto-fixer](https://github.com/scrutinizer-auto-fixer))
+- StaticMap update, fixes \#22 [\#23](https://github.com/gordonbanderson/Mappable/pull/23) ([wernerkrauss](https://github.com/wernerkrauss))
+- some refinement to filter dataobjects  [\#21](https://github.com/gordonbanderson/Mappable/pull/21) ([wernerkrauss](https://github.com/wernerkrauss))
+- do not use window.onload - can be overwritten later [\#20](https://github.com/gordonbanderson/Mappable/pull/20) ([wernerkrauss](https://github.com/wernerkrauss))
+- Make template suffix for info window configurable [\#3](https://github.com/gordonbanderson/Mappable/pull/3) ([wernerkrauss](https://github.com/wernerkrauss))
+- get\_map now accepts more generic SS\_List instead of DataList [\#2](https://github.com/gordonbanderson/Mappable/pull/2) ([wernerkrauss](https://github.com/wernerkrauss))
+- Fixes for 3.1 [\#1](https://github.com/gordonbanderson/Mappable/pull/1) ([wernerkrauss](https://github.com/wernerkrauss))
+
+
+
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

Gruntfile.js

@@ -0,0 +1,31 @@
+module.exports = function (grunt) {
+    grunt.initConfig({
+        pkg: grunt.file.readJSON('package.json'),
+        cssmin: {
+            css: {
+                src: 'css/mapField.css',
+                dest: 'css/mapField.min.css'
+            }
+        },
+        uglify: {
+            js: {
+			    files : {
+			        'javascript/google/mappablegoogle.min.js' : [
+				        'javascript/google/FullScreenControl.js',
+				        'javascript/google/markerclusterer.js',
+				        'javascript/google/maputil.js'
+			        ],
+
+			        'javascript/mapField.min.js' : [
+				         'javascript/mapField.js'
+			        ]
+
+			    }
+			  },
+        },
+    });
+    grunt.loadNpmTasks('grunt-contrib-uglify');
+    grunt.loadNpmTasks('grunt-contrib-watch');
+    grunt.loadNpmTasks('grunt-contrib-cssmin');
+    grunt.registerTask('default', ['cssmin:css', 'uglify:js']);
+};

LICENSE.md

@@ -0,0 +1,12 @@
+Copyright (c) 2012-2016, Gordon B Anderson
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

README.md

@@ -0,0 +1,48 @@
+# Mappable
+[![Build Status](https://travis-ci.org/gordonbanderson/Mappable.svg?branch=3.1)](https://travis-ci.org/gordonbanderson/Mappable)
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/gordonbanderson/Mappable/badges/quality-score.png?b=3.1)](https://scrutinizer-ci.com/g/gordonbanderson/Mappable/?branch=3.1)
+[![Code Coverage](https://scrutinizer-ci.com/g/gordonbanderson/Mappable/badges/coverage.png?b=3.1)](https://scrutinizer-ci.com/g/gordonbanderson/Mappable/?branch=3.1)
+[![Build Status](https://scrutinizer-ci.com/g/gordonbanderson/Mappable/badges/build.png?b=3.1)](https://scrutinizer-ci.com/g/gordonbanderson/Mappable/build-status/3.1)
+[![codecov.io](https://codecov.io/github/gordonbanderson/Mappable/coverage.svg?branch=3.1)](https://codecov.io/github/gordonbanderson/Mappable?branch=3.1)
+
+[![Latest Stable Version](https://poser.pugx.org/weboftalent/mappable/version)](https://packagist.org/packages/weboftalent/mappable)
+[![Latest Unstable Version](https://poser.pugx.org/weboftalent/mappable/v/unstable)](//packagist.org/packages/weboftalent/mappable)
+[![Total Downloads](https://poser.pugx.org/weboftalent/mappable/downloads)](https://packagist.org/packages/weboftalent/mappable)
+[![License](https://poser.pugx.org/weboftalent/mappable/license)](https://packagist.org/packages/weboftalent/mappable)
+[![Monthly Downloads](https://poser.pugx.org/weboftalent/mappable/d/monthly)](https://packagist.org/packages/weboftalent/mappable)
+[![Daily Downloads](https://poser.pugx.org/weboftalent/mappable/d/daily)](https://packagist.org/packages/weboftalent/mappable)
+
+[![Dependency Status](https://www.versioneye.com/php/weboftalent:mappable/badge.svg)](https://www.versioneye.com/php/weboftalent:mappable)
+[![Reference Status](https://www.versioneye.com/php/weboftalent:mappable/reference_badge.svg?style=flat)](https://www.versioneye.com/php/weboftalent:mappable/references)
+
+![codecov.io](https://codecov.io/github/gordonbanderson/Mappable/branch.svg?branch=3.1)
+
+## Maintainers
+
+* Gordon Anderson (Nickname: nontgor)
+	<gordon.b.anderson@gmail.com>
+
+##Introduction
+
+This module provides mapping functionality for SilverStripe DataObjects in a
+manner that is simple as possible for both the programmer and content editor.
+Short codes are also provided to render Google Street View and Google maps.
+
+##Documentation
+* [Installation](./docs/en/Installation.md)
+* [Adding a Map to a DataObject](./docs/en/AddingMapToADataObject.md)
+* [Multiple Maps on the Same Page](./docs/en/MultipleMapsSamePage.md)
+* [Mapping a DataList](./docs/en/MappingDataList.md)
+* [Map Layers](./docs/en/MapLayers.md)
+* [Adding Lines to Maps](./docs/en/AddingLinesToMaps.md)
+* [Google Map Short Codes](./docs/en/GoogleMapShortCodes.md)
+* [Google Streeview Short Codes](./docs/en/GoogleStreetViewShortCodes.md)
+
+For more documentation about the module see the provided documentation located
+inside the docs folder.
+
+##Requirements
+* SilverStripe 3.1 or 3.2
+
+##TODO
+* Add other mapping services such as Leaflet

_config.php

@@ -1,5 +1,12 @@
 <?php
 
-Object::add_extension("DataObject","MappableData");
+//define global path to Components' root folder
+if (!defined('MAPPABLE_MODULE_PATH')) {
+    define('MAPPABLE_MODULE_PATH', rtrim(basename(dirname(__FILE__))));
+}
 
-Object::add_extension("DataObjectSet","MappableDataObjectSet");
+ShortcodeParser::get('default')->register('GoogleStreetView', array('GoogleStreetViewShortCodeHandler','parse_googlestreetview'));
+ShortcodeParser::get('default')->register('GoogleMap', array('GoogleMapShortCodeHandler','parse_googlemap'));
+
+// Cache for a day
+SS_Cache::set_cache_lifetime('mappablegeocoder', 24*60*60);

_config/_config.yml

@@ -0,0 +1,3 @@
+# allow geographical format files to be uploaded
+File:
+  $allowed_extensions: ['gpx', 'kml']

_config/extensions.yml

@@ -0,0 +1,15 @@
+---
+Name: mappable
+After: 'framework/*','cms/*'
+---
+DataObject:
+  extensions:
+    -  MappableData
+
+DataList:
+  extensions:
+    -  MappableDataObjectSet
+
+ArrayList:
+  extensions:
+    -  MappableDataObjectSet

_config/maps.yml

@@ -0,0 +1,15 @@
+---
+Name: mappable
+After: 'framework/*','cms/*'
+---
+Mappable:
+  allow_full_screen: true
+  use_compressed_assets: false
+  mapping_service: 'Google'
+  #service_key: 'YOUR SERVICE KEY'
+
+  #Language to load the Map Service in
+  language: 'en'
+
+MapExtension:
+  map_info_window_suffix: '_MapInfoWindow'