Author: fdesbois Date: 2010-06-22 19:58:22 +0200 (Tue, 22 Jun 2010) New Revision: 419 Url: http://nuiton.org/repositories/revision/sandbox/419 Log: Test JAK for KML files Added: cartography/trunk/src/main/java/org/nuiton/cartography/KMLCreator.java cartography/trunk/src/main/java/org/nuiton/cartography/MainServlet.java cartography/trunk/src/main/resources/ cartography/trunk/src/main/resources/log4j.properties cartography/trunk/src/test/ cartography/trunk/src/test/java/ cartography/trunk/src/test/java/org/ cartography/trunk/src/test/java/org/nuiton/ cartography/trunk/src/test/java/org/nuiton/cartography/ cartography/trunk/src/test/java/org/nuiton/cartography/KMLCreatorTest.java Modified: cartography/trunk/pom.xml cartography/trunk/src/main/webapp/WEB-INF/web.xml cartography/trunk/src/main/webapp/charente-maritime.html cartography/trunk/src/main/webapp/kml/charente-maritime.kml Modified: cartography/trunk/pom.xml =================================================================== --- cartography/trunk/pom.xml 2010-06-22 15:03:24 UTC (rev 418) +++ cartography/trunk/pom.xml 2010-06-22 17:58:22 UTC (rev 419) @@ -18,10 +18,23 @@ <dependencies> <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> <version>1.1.1</version> </dependency> + + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.16</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <version>1.3.2-SNAPSHOT</version> + </dependency> <dependency> <groupId>junit</groupId> @@ -44,8 +57,26 @@ <scope>compile</scope> </dependency> + <dependency> + <groupId>de.micromata.jak</groupId> + <artifactId>JavaAPIforKml</artifactId> + <version>2.2.0-SNAPSHOT</version> + </dependency> + </dependencies> + <repositories> + <repository> + <id>maven2-repository.dev.java.net</id> + <name>Java.net Maven 2 Repository</name> + <url>http://download.java.net/maven/2</url> + <layout>default</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + </repositories> + <!-- ************************************************************* --> <!-- *** Project Information ************************************* --> <!-- ************************************************************* --> @@ -63,7 +94,21 @@ <properties> </properties> + + <build> + <resources> + <resource> + <directory>src/main/resources</directory> + <includes> + <include>**/*</include> + </includes> + <filtering>true</filtering> + </resource> + </resources> + + </build> + <!-- Source control management. --> <scm> <connection>scm:svn:http://svn.nuiton.org/svn/sandbox/cartography/trunk</connection> Added: cartography/trunk/src/main/java/org/nuiton/cartography/KMLCreator.java =================================================================== --- cartography/trunk/src/main/java/org/nuiton/cartography/KMLCreator.java (rev 0) +++ cartography/trunk/src/main/java/org/nuiton/cartography/KMLCreator.java 2010-06-22 17:58:22 UTC (rev 419) @@ -0,0 +1,78 @@ +package org.nuiton.cartography; + +import de.micromata.opengis.kml.v_2_2_0.ColorMode; +import de.micromata.opengis.kml.v_2_2_0.Document; +import de.micromata.opengis.kml.v_2_2_0.Kml; +import de.micromata.opengis.kml.v_2_2_0.Style; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.io.File; +import java.io.FileNotFoundException; + +/** + * Created: 22 juin 2010 + * + * @author fdesbois <fdesbois@codelutin.com> + * @version $Id$ + */ +public class KMLCreator { + + private static final Log log = LogFactory.getLog(KMLCreator.class); + + public static File KML_DIR = new File(System.getProperty("java.io.tmpdir")); + + public static void setKmlDirectory(File dir) { + KML_DIR = dir; + } + + public static File create(String filename) throws FileNotFoundException { + Kml kml = new Kml(); + Document document = kml.createAndSetDocument(); + + Style style = document.createAndAddStyle(); + + style.createAndSetLineStyle().withColor("cc2d3939").withWidth(3); + style.createAndSetPolyStyle().withColor("66d1d1ff").withColorMode(ColorMode.RANDOM); + + document.createAndAddPlacemark(). + withName("Port de La Rochelle"). + withDescription("<![CDATA[\n" + + " <p>Embarquements depuis janvier 2010</p>\n" + + " <table>\n" + + " <tr>\n" + + " <th>Navire</th>\n" + + " <th>Embarquements réalisés</th>\n" + + " <th>Embarquements refusés</th>\n" + + " </tr>\n" + + " <tr>\n" + + " <td>COUCOU CASSE-COU</td>\n" + + " <td>10</td>\n" + + " <td>2</td>\n" + + " </tr>\n" + + " <td>PILE-POIL</td>\n" + + " <td>0</td>\n" + + " <td>1</td>\n" + + " </tr>\n" + + " <tr>\n" + + " <td>LE FLEURISTE</td>\n" + + " <td>8</td>\n" + + " <td>0</td>\n" + + " </tr>\n" + + " </table>\n" + + " ]]>"). + withOpen(Boolean.TRUE). + createAndSetPoint(). + addToCoordinates(-1.153307, 46.157659); + + File output = new File(KML_DIR, filename); + + kml.marshal(output); + + if (log.isDebugEnabled()) { + log.debug("Create kml file : " + output.getAbsolutePath()); + } + + return output; + } +} Added: cartography/trunk/src/main/java/org/nuiton/cartography/MainServlet.java =================================================================== --- cartography/trunk/src/main/java/org/nuiton/cartography/MainServlet.java (rev 0) +++ cartography/trunk/src/main/java/org/nuiton/cartography/MainServlet.java 2010-06-22 17:58:22 UTC (rev 419) @@ -0,0 +1,44 @@ +package org.nuiton.cartography; + +import de.micromata.opengis.kml.v_2_2_0.ColorMode; +import de.micromata.opengis.kml.v_2_2_0.Document; +import de.micromata.opengis.kml.v_2_2_0.Kml; +import de.micromata.opengis.kml.v_2_2_0.Style; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.io.IOException; + +/** + * Created: 22 juin 2010 + * + * @author fdesbois <fdesbois@codelutin.com> + * @version $Id$ + */ +public class MainServlet extends HttpServlet { + + private static final Log log = LogFactory.getLog(MainServlet.class); + + @Override + public void doGet(HttpServletRequest request, HttpServletResponse response) + throws IOException, ServletException { + this.doPost(request, response); + } + + @Override + public void doPost(HttpServletRequest request, HttpServletResponse response) + throws IOException, ServletException { + + if (log.isDebugEnabled()) { + log.debug("Start doPost"); + } + + KMLCreator.create("test.kml"); + } + +} Added: cartography/trunk/src/main/resources/log4j.properties =================================================================== --- cartography/trunk/src/main/resources/log4j.properties (rev 0) +++ cartography/trunk/src/main/resources/log4j.properties 2010-06-22 17:58:22 UTC (rev 419) @@ -0,0 +1,11 @@ +# Default to info level output; this is very handy if you eventually use Hibernate as well. +log4j.rootCategory=warn, A1 + +# A1 is set to be a ConsoleAppender. +log4j.appender.A1=org.apache.log4j.ConsoleAppender + +# A1 uses PatternLayout. +log4j.appender.A1.layout=org.apache.log4j.PatternLayout +log4j.appender.A1.layout.ConversionPattern=%d [%p] %c{2} %m%n + +log4j.logger.org.nuiton.cartography=DEBUG Modified: cartography/trunk/src/main/webapp/WEB-INF/web.xml =================================================================== --- cartography/trunk/src/main/webapp/WEB-INF/web.xml 2010-06-22 15:03:24 UTC (rev 418) +++ cartography/trunk/src/main/webapp/WEB-INF/web.xml 2010-06-22 17:58:22 UTC (rev 419) @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http:/java.sun.com/dtd/web-app_2_3.dtd"> - <!--<servlet>--> - <!--<servlet-name>HelloServlet</servlet-name>--> - <!--<servlet-class>org.nuiton.jrst.HelloServlet</servlet-class>--> - <!--</servlet>--> - <!--<servlet-mapping>--> - <!--<servlet-name>HelloServlet</servlet-name>--> - <!--<url-pattern>/hello</url-pattern>--> - <!--</servlet-mapping>--> + <servlet> + <servlet-name>Main</servlet-name> + <servlet-class>org.nuiton.cartography.MainServlet</servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>Main</servlet-name> + <url-pattern>/start</url-pattern> + </servlet-mapping> </web-app> Modified: cartography/trunk/src/main/webapp/charente-maritime.html =================================================================== --- cartography/trunk/src/main/webapp/charente-maritime.html 2010-06-22 15:03:24 UTC (rev 418) +++ cartography/trunk/src/main/webapp/charente-maritime.html 2010-06-22 17:58:22 UTC (rev 419) @@ -57,7 +57,7 @@ var center = new OpenLayers.LonLat(-1.153586,46.158016); map.setCenter(center, 7); - alert('loaded'); + <!--alert('loaded');--> } function onPopupClose(evt) { Modified: cartography/trunk/src/main/webapp/kml/charente-maritime.kml =================================================================== --- cartography/trunk/src/main/webapp/kml/charente-maritime.kml 2010-06-22 15:03:24 UTC (rev 418) +++ cartography/trunk/src/main/webapp/kml/charente-maritime.kml 2010-06-22 17:58:22 UTC (rev 419) @@ -605,7 +605,30 @@ </Placemark> <Placemark id="la-rochelle-harbour"> <name>Port de La Rochelle</name> - <description>TEST</description> + <description><![CDATA[ + <p>Embarquements depuis janvier 2010</p> + <table> + <tr> + <th>Navire</th> + <th>Embarquements réalisés</th> + <th>Embarquements refusés</th> + </tr> + <tr> + <td>COUCOU CASSE-COU</td> + <td>10</td> + <td>2</td> + </tr> + <td>PILE-POIL</td> + <td>0</td> + <td>1</td> + </tr> + <tr> + <td>LE FLEURISTE</td> + <td>8</td> + <td>0</td> + </tr> + </table> + ]]></description> <Point> <coordinates> -1.153307, 46.157659 Added: cartography/trunk/src/test/java/org/nuiton/cartography/KMLCreatorTest.java =================================================================== --- cartography/trunk/src/test/java/org/nuiton/cartography/KMLCreatorTest.java (rev 0) +++ cartography/trunk/src/test/java/org/nuiton/cartography/KMLCreatorTest.java 2010-06-22 17:58:22 UTC (rev 419) @@ -0,0 +1,47 @@ +package org.nuiton.cartography; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; +import org.nuiton.util.FileUtil; + +import java.io.File; +import java.io.FileNotFoundException; +import java.io.IOException; + +/** + * Created: 22 juin 2010 + * + * @author fdesbois <fdesbois@codelutin.com> + * @version $Id$ + */ +public class KMLCreatorTest { + + private static final Log log = LogFactory.getLog(KMLCreatorTest.class); + + private static File DIR_TESTS_DATA; + + @BeforeClass + public static void setUpClass() throws IOException { + // Initialize DIR_TESTS_DATA to target/surefire-data + String basedirPath = System.getenv("basedir"); + if (basedirPath == null) { + basedirPath = new File("").getAbsolutePath(); + } + DIR_TESTS_DATA = new File(basedirPath, + "target" + File.separator + "surefire-data"); + FileUtil.createDirectoryIfNecessary(DIR_TESTS_DATA); + log.info("Initialize main tests-data directory : " + DIR_TESTS_DATA.getAbsolutePath()); + } + + @Test + public void testCreate() throws FileNotFoundException { + + KMLCreator.setKmlDirectory(DIR_TESTS_DATA); + File result = KMLCreator.create("test1.kml"); + + Assert.assertTrue(result.exists()); + } +}