Commit 6fd1ce93 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Omite submódulo proj4js, migra a proj4 actualizado 

En lugar de usar un fork propio desactualizado, emplea la versión actual
del paquete presente en npm, adaptando su uso para mantener su
funcionamiento.

El fork se justificó por "manenerse en la versión funcional del plugin",
aunque tras revisar los problemas que surgían con versiones siguientes y
el uso que se hacía del mismo, parece más bien que se cometió un error
porque no todo el mundo sabe copiar y pegar.

Elimina submódulo, adapta rutas y config de compilado.
parent ed485983

.gitmodules

+0 −5
Original line number Diff line number Diff line 
[submodule "public/javascript/proj4js"]

	path = public/javascript/proj4js

	url = ../../third-party/proj4js.git

	branch = master

	ignore = dirty

[submodule "public/stylesheets"]

	path = public/stylesheets

	url = ../style.git

grunt/config/cleanBuiltApp.js

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ module.exports = function(grunt) { 
	var directoriesToDelete = [

		'alertify', 'awesome-markers', 'cbtree', 'd3Tip', 'dijit', 'dojo', 'dojox', 'deepmerge', 'dropzone',

		'handlebars', 'L-areaselect', 'L-coordinates', 'L-draw', 'L-miniMap', 'L-navBar', 'leaflet',

		'leaflet-nontiledlayer', 'mediatorjs', 'moment', 'uuid', 'proj4js', 'pruneCluster', 'put-selector',

		'leaflet-nontiledlayer', 'mediatorjs', 'moment', 'uuid', 'proj4', 'pruneCluster', 'put-selector',

		'redmic', 'RWidgets', 'sockjs', 'stomp-websocket', 'templates', 'tv4', 'wicket'

	];

package.json

+1 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ 
    "uuid": "8.3.2",

    "packery": "2.1.2",

    "pdfjs-dist-viewer-min": "2.12.313",

    "proj4": "2.8.0",

    "prunecluster": "https://github.com/pedroetb/PruneCluster.git",

    "put-selector": "0.3.6",

    "sockjs-client": "1.1.4",

public/javascript/dojoConfig.js

+2 −2
Original line number Diff line number Diff line
@@ -57,8 +57,8 @@ dojoConfig = { 
		name: 'cbtree',

		location: '../cbtree'

	},{

		name: 'proj4js',

		location: '../proj4js/dist'

		name: 'proj4',

		location: '../proj4/dist'

	},{

		name: 'RWidgets',

		location: '../redmic/widgets'

public/javascript/proj4

0 → 120000
+1 −0
Original line number Diff line number Diff line 
../../node_modules/proj4/
 
 No newline at end of file