diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/WEB-INF/lib/commons-logging.jar b/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/WEB-INF/lib/commons-logging.jar deleted file mode 100644 index 8758a96b..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/WEB-INF/lib/commons-logging.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/WEB-INF/lib/jstl-api.jar b/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/WEB-INF/lib/jstl-api.jar deleted file mode 100644 index 80a5737f..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/WEB-INF/lib/jstl-api.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/WEB-INF/lib/jstl-impl.jar b/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/WEB-INF/lib/jstl-impl.jar deleted file mode 100644 index e5a9342f..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/WEB-INF/lib/jstl-impl.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/WEB-INF/lib/log4j.jar b/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/WEB-INF/lib/log4j.jar deleted file mode 100644 index 068867eb..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/WEB-INF/lib/log4j.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/WEB-INF/lib/util-bridges.jar b/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/WEB-INF/lib/util-bridges.jar deleted file mode 100644 index 7d7435fe..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/WEB-INF/lib/util-bridges.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/WEB-INF/lib/util-taglib.jar b/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/WEB-INF/lib/util-taglib.jar deleted file mode 100644 index fbba5f0a..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/WEB-INF/lib/util-taglib.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/WEB-INF/tld/c.tld b/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/WEB-INF/tld/c.tld deleted file mode 100644 index 98efa6a6..00000000 --- a/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/WEB-INF/tld/c.tld +++ /dev/null @@ -1,572 +0,0 @@ - - - - - JSTL 1.2 core library - JSTL core - 1.2 - c - http://java.sun.com/jsp/jstl/core - - - - Provides core validation features for JSTL tags. - - - org.apache.taglibs.standard.tlv.JstlCoreTLV - - - - - - Catches any Throwable that occurs in its body and optionally - exposes it. - - catch - org.apache.taglibs.standard.tag.common.core.CatchTag - JSP - - -Name of the exported scoped variable for the -exception thrown from a nested action. The type of the -scoped variable is the type of the exception thrown. - - var - false - false - - - - - - Simple conditional tag that establishes a context for - mutually exclusive conditional operations, marked by - <when> and <otherwise> - - choose - com.liferay.taglib.core.ChooseTag - JSP - - - - - Simple conditional tag, which evalutes its body if the - supplied condition is true and optionally exposes a Boolean - scripting variable representing the evaluation of this condition - - if - com.liferay.taglib.core.IfTag - JSP - - -The test condition that determines whether or -not the body content should be processed. - - test - true - true - boolean - - - -Name of the exported scoped variable for the -resulting value of the test condition. The type -of the scoped variable is Boolean. - - var - false - false - - - -Scope for var. - - scope - false - false - - - - - - Retrieves an absolute or relative URL and exposes its contents - to either the page, a String in 'var', or a Reader in 'varReader'. - - import - org.apache.taglibs.standard.tag.rt.core.ImportTag - org.apache.taglibs.standard.tei.ImportTEI - JSP - - -The URL of the resource to import. - - url - true - true - - - -Name of the exported scoped variable for the -resource's content. The type of the scoped -variable is String. - - var - false - false - - - -Scope for var. - - scope - false - false - - - -Name of the exported scoped variable for the -resource's content. The type of the scoped -variable is Reader. - - varReader - false - false - - - -Name of the context when accessing a relative -URL resource that belongs to a foreign -context. - - context - false - true - - - -Character encoding of the content at the input -resource. - - charEncoding - false - true - - - - - - The basic iteration tag, accepting many different - collection types and supporting subsetting and other - functionality - - forEach - org.apache.taglibs.standard.tag.rt.core.ForEachTag - org.apache.taglibs.standard.tei.ForEachTEI - JSP - - -Collection of items to iterate over. - - items - false - true - java.lang.Object - - java.lang.Object - - - - -If items specified: -Iteration begins at the item located at the -specified index. First item of the collection has -index 0. -If items not specified: -Iteration begins with index set at the value -specified. - - begin - false - true - int - - - -If items specified: -Iteration ends at the item located at the -specified index (inclusive). -If items not specified: -Iteration ends when index reaches the value -specified. - - end - false - true - int - - - -Iteration will only process every step items of -the collection, starting with the first one. - - step - false - true - int - - - -Name of the exported scoped variable for the -current item of the iteration. This scoped -variable has nested visibility. Its type depends -on the object of the underlying collection. - - var - false - false - - - -Name of the exported scoped variable for the -status of the iteration. Object exported is of type -javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested -visibility. - - varStatus - false - false - - - - - - Iterates over tokens, separated by the supplied delimeters - - forTokens - org.apache.taglibs.standard.tag.rt.core.ForTokensTag - JSP - - -String of tokens to iterate over. - - items - true - true - java.lang.String - - java.lang.String - - - - -The set of delimiters (the characters that -separate the tokens in the string). - - delims - true - true - java.lang.String - - - -Iteration begins at the token located at the -specified index. First token has index 0. - - begin - false - true - int - - - -Iteration ends at the token located at the -specified index (inclusive). - - end - false - true - int - - - -Iteration will only process every step tokens -of the string, starting with the first one. - - step - false - true - int - - - -Name of the exported scoped variable for the -current item of the iteration. This scoped -variable has nested visibility. - - var - false - false - - - -Name of the exported scoped variable for the -status of the iteration. Object exported is of -type -javax.servlet.jsp.jstl.core.LoopTag -Status. This scoped variable has nested -visibility. - - varStatus - false - false - - - - - - Like <%= ... >, but for expressions. - - out - org.apache.taglibs.standard.tag.rt.core.OutTag - JSP - - -Expression to be evaluated. - - value - true - true - - - -Default value if the resulting value is null. - - default - false - true - - - -Determines whether characters <,>,&,'," in the -resulting string should be converted to their -corresponding character entity codes. Default value is -true. - - escapeXml - false - true - - - - - - - Subtag of <choose> that follows <when> tags - and runs only if all of the prior conditions evaluated to - 'false' - - otherwise - com.liferay.taglib.core.OtherwiseTag - JSP - - - - - Adds a parameter to a containing 'import' tag's URL. - - param - org.apache.taglibs.standard.tag.rt.core.ParamTag - JSP - - -Name of the query string parameter. - - name - true - true - - - -Value of the parameter. - - value - false - true - - - - - - Redirects to a new URL. - - redirect - org.apache.taglibs.standard.tag.rt.core.RedirectTag - JSP - - -The URL of the resource to redirect to. - - url - false - true - - - -Name of the context when redirecting to a relative URL -resource that belongs to a foreign context. - - context - false - true - - - - - - Removes a scoped variable (from a particular scope, if specified). - - remove - org.apache.taglibs.standard.tag.common.core.RemoveTag - empty - - -Name of the scoped variable to be removed. - - var - true - false - - - -Scope for var. - - scope - false - false - - - - - - Sets the result of an expression evaluation in a 'scope' - - set - org.apache.taglibs.standard.tag.rt.core.SetTag - JSP - - -Name of the exported scoped variable to hold the value -specified in the action. The type of the scoped variable is -whatever type the value expression evaluates to. - - var - false - false - - - -Expression to be evaluated. - - value - false - true - - java.lang.Object - - - - -Target object whose property will be set. Must evaluate to -a JavaBeans object with setter property property, or to a -java.util.Map object. - - target - false - true - - - -Name of the property to be set in the target object. - - property - false - true - - - -Scope for var. - - scope - false - false - - - - - - Creates a URL with optional query parameters. - - url - org.apache.taglibs.standard.tag.rt.core.UrlTag - JSP - - -Name of the exported scoped variable for the -processed url. The type of the scoped variable is -String. - - var - false - false - - - -Scope for var. - - scope - false - false - - - -URL to be processed. - - value - false - true - - - -Name of the context when specifying a relative URL -resource that belongs to a foreign context. - - context - false - true - - - - - - Subtag of <choose> that includes its body if its - condition evalutes to 'true' - - when - com.liferay.taglib.core.WhenTag - JSP - - -The test condition that determines whether or not the -body content should be processed. - - test - true - true - boolean - - - - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/html/plugin/top.jsp b/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/html/plugin/top.jsp index 5f653c04..b39fd5c1 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/html/plugin/top.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/html/plugin/top.jsp @@ -117,10 +117,10 @@ Liferay.on('<%= "mapItMapReady" + StringPool.PERIOD + getServletContext().getSer extent.extend(new OpenLayers.LonLat(9.6771486410157, 44.486291328126)); extent.extend(new OpenLayers.LonLat(12.431970418358, 42.214181342774)); - var geographic = new OpenLayers.Projection("EPSG:4326"); + var geographic = new OpenLayers.Projection("EPSG:4326"); var mercator = new OpenLayers.Projection( "EPSG:3857"); extent.transform(geographic,mercator ); - mapItMap.addOption({restrictedExtent: extent}); + //mapItMap.addOption({restrictedExtent: extent}); /* var boxes = new OpenLayers.Layer.Boxes("boxes"); var box = new OpenLayers.Marker.Box(extent); @@ -135,7 +135,7 @@ Liferay.on('<%= "mapItMapReady" + StringPool.PERIOD + getServletContext().getSer layers: 'rt_osm.civici.point', transparent: true}, {isBaseLayer: false, visibility : false} ); - mapItMap.addWMSLayer(civici); + //mapItMap.addWMSLayer(civici); var comuni = new OpenLayers.Layer.WMS( 'Comuni', @@ -144,7 +144,7 @@ Liferay.on('<%= "mapItMapReady" + StringPool.PERIOD + getServletContext().getSer layers: 'rt_ambamm.idcomuni.rt.poly', transparent: true}, {isBaseLayer: false} ); - mapItMap.addWMSLayer(comuni); + //mapItMap.addWMSLayer(comuni); var topografico = new OpenLayers.Layer.WMS( 'Topografico', @@ -153,7 +153,7 @@ Liferay.on('<%= "mapItMapReady" + StringPool.PERIOD + getServletContext().getSer layers: 'rt_cartoteca.dbt.2k', transparent: true}, {isBaseLayer: false, visibility : false} ); - mapItMap.addWMSLayer(topografico); + //mapItMap.addWMSLayer(topografico); var rischio_bacini_regionali = new OpenLayers.Layer.WMS( 'Rischio Idrogeologico', @@ -162,7 +162,7 @@ Liferay.on('<%= "mapItMapReady" + StringPool.PERIOD + getServletContext().getSer layers: 'rt_peridr.rischio_bacini_regionali', transparent: true}, {isBaseLayer: false, visibility : false} ); - mapItMap.addWMSLayer(rischio_bacini_regionali); + //mapItMap.addWMSLayer(rischio_bacini_regionali); var catasto_strade = new OpenLayers.Layer.WMS( 'Strade', @@ -171,7 +171,7 @@ Liferay.on('<%= "mapItMapReady" + StringPool.PERIOD + getServletContext().getSer layers: 'rt_cat.idcatstrade.rt', transparent: true}, {isBaseLayer: false, visibility : false} ); - mapItMap.addWMSLayer(catasto_strade); + //mapItMap.addWMSLayer(catasto_strade); var catasto_fabbricati = new OpenLayers.Layer.WMS( 'Fabbricati', @@ -180,7 +180,7 @@ Liferay.on('<%= "mapItMapReady" + StringPool.PERIOD + getServletContext().getSer layers: 'rt_cat.idcatfabbr.rt', transparent: true}, {isBaseLayer: false, visibility : false} ); - mapItMap.addWMSLayer(catasto_fabbricati); + //mapItMap.addWMSLayer(catasto_fabbricati); var catasto_fogli = new OpenLayers.Layer.WMS( 'Fogli Catastali', @@ -189,7 +189,7 @@ Liferay.on('<%= "mapItMapReady" + StringPool.PERIOD + getServletContext().getSer layers: 'rt_cat.idcatbdfog.rt', transparent: true}, {isBaseLayer: false, visibility : false} ); - mapItMap.addWMSLayer(catasto_fogli); + //mapItMap.addWMSLayer(catasto_fogli); var catasto_particelle = new OpenLayers.Layer.WMS( 'Particelle Catastali', @@ -198,7 +198,7 @@ Liferay.on('<%= "mapItMapReady" + StringPool.PERIOD + getServletContext().getSer layers: 'rt_cat.idcatpart.rt', transparent: true}, {isBaseLayer: false, visibility : false} ); - mapItMap.addWMSLayer(catasto_particelle); + //mapItMap.addWMSLayer(catasto_particelle); var markerStyle = { @@ -216,7 +216,7 @@ Liferay.on('<%= "mapItMapReady" + StringPool.PERIOD + getServletContext().getSer }]; mapItMap.addLayerPoints(layerName, point, true, {selectable: true, displayInLayerSwitcher: false}); /* mapItMap.moveMap(longitude , latitude , mapItMap.getCurrentZoom()); */ - var secureZoom = "8"; + var secureZoom = "14"; if(editableZoom != undefined && editableZoom != null){ var secureZoom =editableZoom.val() } @@ -306,19 +306,20 @@ Liferay.on('<%= "mapItMapReady" + StringPool.PERIOD + getServletContext().getSer featurePicker.activate(); console.log("Activated"); */ - A.one("#map").append('
'); - var lockButton = A.one('#container_btn .bloccamap'), - lockLayer = A.one('#map .layermap'), - latValue = editableLatitude != null ? editableLatitude.val() : latitude.val(), - longValue = editableLongitude != null ? editableLongitude.val() : longitude.val(), - locked = latValue!="" && longValue!=""; - lockMap(lockButton, lockLayer, latValue, longValue, !locked) - - A.one('#container_btn .bloccamap').on('click', function(event){ - var nodeObject = event.currentTarget, - locked = event.currentTarget.hasClass('fa-lock'); - lockMap(lockButton, lockLayer, latValue, longValue, locked); - }); + A.one("#map").append('
'); + var lockButton = A.one('#container_btn .bloccamap'), + lockLayer = A.one('#map .layermap'), + latValue = editableLatitude != null ? editableLatitude.val() : latitude.val(), + longValue = editableLongitude != null ? editableLongitude.val() : longitude.val(), + locked = latValue!="" && longValue!=""; + lockMap(lockButton, lockLayer, latValue, longValue, !locked) + + A.one('#container_btn .bloccamap').on('click', function(event){ + var nodeObject = event.currentTarget, + locked = event.currentTarget.hasClass('fa-lock'); + lockMap(lockButton, lockLayer, latValue, longValue, locked); + }); + } });