diff --git a/README.md b/README.md
new file mode 100644
--- /dev/null
+++ b/README.md
@@ -0,0 +1,2 @@
+please read my diploma thesis 2015 (TU Vienna)
+Haskell OpenLayers Wrapper
diff --git a/olwrapper.cabal b/olwrapper.cabal
--- a/olwrapper.cabal
+++ b/olwrapper.cabal
@@ -1,5 +1,5 @@
Name: olwrapper
-Version: 0.3.7.10
+Version: 0.3.7.12
Synopsis: An OpenLayers JavaScript Wrapper and Webframework with snaplet-fay
Description: test
Author: Thomas Edelmann
@@ -10,6 +10,13 @@
Cabal-version: >=1.12
license: GPL
license-file: LICENSE
+
+extra-source-files:
+ LICENSE
+ README.md
+ snaplets/fay/devel.cfg
+ snaplets/heist/templates/index.tpl
+ static/dummy
Flag development
Description: Whether to build the server in development (interpreted) mode
diff --git a/snaplets/fay/devel.cfg b/snaplets/fay/devel.cfg
new file mode 100644
--- /dev/null
+++ b/snaplets/fay/devel.cfg
@@ -0,0 +1,24 @@
+# "Development": Compile files on every request.
+# "Production": Compile all files in snaplets/src/fay when the application is started and then serve them statically.
+#
+# Both methods will write files to disk for debugging purposes.
+# Default is "Development".
+compileMode = "Development"
+# Print more or less information about what the snaplet is doing.
+# Default is on.
+verbose = on
+# Run js-beautify on the results if it is available in the PATH.
+# If it isn't available the compiled file will be used as is.
+# Default is on.
+prettyPrint = on
+# A comma-separated list of directories to look for fay imports in.
+# This is useful if you want to share modules between Fay and Snap.
+# Paths are relative to the root of the snap application.
+# snaplets/fay/src will always be checked for imports.
+# Default is "" meaning no additional directories will be checked.
+includeDirs = "wrapper,web"
+# A comma separated list of Fay package names.
+# This gives the same result as using includeDirs,
+# except Fay figures out the paths for you.
+# Default is "" meaning no other Fay packages will be used.
+packages = "fay-text,fay-jquery"
diff --git a/snaplets/fay/src/Index.hs b/snaplets/fay/src/Index.hs
--- a/snaplets/fay/src/Index.hs
+++ b/snaplets/fay/src/Index.hs
@@ -8,18 +8,15 @@
import Prelude hiding (void)
import JQuery hiding (Element)
import Fay.Text (Text, fromString)
-import FFI
+import Fay.FFI
import OpenLayers -- include OpenLayers, to wrap the OlApp
-
+import OpenLayers.Internal
addOnload :: Fay f -> Fay ()
addOnload = ffi "window.addEventListener(\"load\", %1)"
main :: Fay ()
main = addOnload onload
-
-void :: Fay f -> Fay ()
-void f = f >> return ()
onload :: Fay ()
onload = void $ do
diff --git a/snaplets/heist/templates/index.tpl b/snaplets/heist/templates/index.tpl
new file mode 100644
--- /dev/null
+++ b/snaplets/heist/templates/index.tpl
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
+
+
+ Haskell OpenLayers Wrapper - diploma thesis TU Vienna 2014/2015 - Geoinformation
+
+
+
+
+
+
+
+ Haskell OpenLayers Wrapper
+
+
+
+
+
+
+
+
+
+ | Zoomlevel: |
+
+
+ |
+
+
+ | Kartenzentrum (WGS 84): |
+
+
+ |
+
+
+ | Kartenzentrum (Mercator): |
+
+
+ |
+
+
+
+
+
diff --git a/static/dummy b/static/dummy
new file mode 100644
--- /dev/null
+++ b/static/dummy
diff --git a/web/OlApp.hs b/web/OlApp.hs
--- a/web/OlApp.hs
+++ b/web/OlApp.hs
@@ -4,10 +4,12 @@
-}
module OlApp where
-import Prelude hiding (void)
+import Prelude hiding (void)
import OpenLayers.Func
import OpenLayers.Types
+import OpenLayers.Internal
import Tutorial.OlApp (designTutorialMap)
+import Fay.FFI
-- | ID for the combination of the HTML-Element map and the OpenLayers object
targetId = "map"
diff --git a/web/Tutorial/OlApp.hs b/web/Tutorial/OlApp.hs
--- a/web/Tutorial/OlApp.hs
+++ b/web/Tutorial/OlApp.hs
@@ -1,10 +1,12 @@
module Tutorial.OlApp where
-import Prelude hiding (void)
+import Prelude hiding (void)
import OpenLayers.Func
import OpenLayers.Types
import OpenLayers.Html
+import OpenLayers.Internal
import Tutorial.Traffic
+import Fay.FFI
zoomlevel = 11
defaultopacity = Opacity 80
diff --git a/wrapper/OpenLayers.hs b/wrapper/OpenLayers.hs
--- a/wrapper/OpenLayers.hs
+++ b/wrapper/OpenLayers.hs
@@ -3,11 +3,14 @@
Description : combine OpenLayers with Fay
-}
module OpenLayers where
+
import Prelude hiding (void)
-import OpenLayers.Func (void, setDefaultView, setTarget)
-import FFI
+import OpenLayers.Func (setDefaultView, setTarget)
+import OpenLayers.Internal
import Fay.Text
import OlApp (targetId, designMap)
+import Fay.FFI
+
-- | Adds an default naked OpenLayers Map Object
addDefaultMap :: Fay ()
addDefaultMap = ffi "olmap = new ol.Map({renderer: 'canvas'})"
diff --git a/wrapper/OpenLayers/Func.hs b/wrapper/OpenLayers/Func.hs
--- a/wrapper/OpenLayers/Func.hs
+++ b/wrapper/OpenLayers/Func.hs
@@ -13,12 +13,14 @@
-- Fay JQuery always uses Text, i do not want this so there is always an equivalent function with ' at the end
-- that takes a String as parameter (defined in the OpenLayersHtmlFunc module)
+
import Prelude hiding (void)
import JQuery
import Fay.Text hiding (head, tail, map)
import OpenLayers.Types
import OpenLayers.Html
-import FFI
+import Fay.FFI
+import OpenLayers.Internal
-- * NEW FUNCTION
@@ -226,9 +228,6 @@
-- * OTHER FUNCTION
coordFixed :: (Double, Double) -> Integer -> Fay Text
coordFixed = ffi "%1[0].toFixed(%2) + ',' + %1[1].toFixed(%2)"
-
-void :: Fay f -> Fay ()
-void f = f >> return ()
lois :: Fay f -> f
lois = ffi "%1"
diff --git a/wrapper/OpenLayers/Html.hs b/wrapper/OpenLayers/Html.hs
--- a/wrapper/OpenLayers/Html.hs
+++ b/wrapper/OpenLayers/Html.hs
@@ -5,9 +5,11 @@
module OpenLayers.Html where
import JQuery
-import FFI
import Fay.Text
import OpenLayers.HtmlInternal
+import OpenLayers.Internal
+import Fay.FFI
+import Prelude hiding (void)
addTextToHtml :: String -> String -> String -> Fay ()
addTextToHtml content element id = void $ do
diff --git a/wrapper/OpenLayers/Types.hs b/wrapper/OpenLayers/Types.hs
--- a/wrapper/OpenLayers/Types.hs
+++ b/wrapper/OpenLayers/Types.hs
@@ -70,7 +70,7 @@
| Hyb -- ^ MapQuest's hybrid
| Osm -- ^ MapQuest's OpenStreetMap
| OSM -- ^ OpenStreetMap
- deriving (Eq)
+ deriving (Show, Eq)
-- * List
-- | puts the sources from MapQuest in a list