Merge branch 'master' into enhancement

.gitignore

@@ -1 +1,2 @@
 .idea/
+vendor

composer.json

@@ -0,0 +1,22 @@
+{
+    "name": "calderacc/staticmaplite",
+    "type": "library",
+    "license": "Apache",
+    "authors": [
+        {
+            "name": "Gerhard Koch",
+            "email": "gerhard.koch@ymail.com"
+        },
+        {
+            "name": "Malte Hübner",
+            "email": "maltehuebner@gmx.org"
+        }
+    ],
+    "autoload": {
+        "psr-4": {
+            "StaticMapLite\\": "src"
+        }
+    },
+    "minimum-stability": "stable",
+    "require": {}
+}

src/staticMapLite.php

@@ -1,36 +1,9 @@
 <?php
 
-/**
+namespace StaticMapLite;
- * staticMapLite 0.3.1
- *
- * Copyright 2009 Gerhard Koch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * @author Gerhard Koch <gerhard.koch AT ymail.com>
- *
- * USAGE:
- *
- *  staticmap.php?center=40.714728,-73.998672&zoom=14&size=512x512&maptype=mapnik&markers=40.702147,-74.015794,blues|40.711614,-74.012318,greeng|40.718217,-73.998284,redc
- *
- */
 
-error_reporting(0);
+class staticMapLite
-ini_set('display_errors', 'off');
-
-Class staticMapLite
 {
-
     protected $maxWidth = 1024;
     protected $maxHeight = 1024;
 
@@ -403,8 +376,4 @@ Class staticMapLite
 
         }
     }
-
 }
-
-$map = new staticMapLite();
-print $map->showMap();

web/staticmap.php

@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * staticMapLite 0.3.1
+ *
+ * Copyright 2009 Gerhard Koch
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @author Gerhard Koch <gerhard.koch AT ymail.com>
+ *
+ * USAGE:
+ *
+ *  staticmap.php?center=40.714728,-73.998672&zoom=14&size=512x512&maptype=mapnik&markers=40.702147,-74.015794,blues|40.711614,-74.012318,greeng|40.718217,-73.998284,redc
+ *
+ */
+
+require_once '../vendor/autoload.php';
+
+use StaticMapLite\staticMapLite;
+
+$map = new staticMapLite();
+print $map->showMap();