Commit Graph

81 Commits

Author SHA1 Message Date
mdtrooper 8f3d8f9185 2010-03-03 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_gis.php: add in the last time a function "printMap2"
	that it is a clean function. Change the function "printMap" to call
	"printMap2".
	
	* include/javascript/openlayers.pandora.js: in function "js_printMap" set
	the spherical Mercator for google maps. 
	
	* operation/gis_maps/render_view.php: add to list of $baselayers the name
	of baselayer. Change order of div for map because now the script don't
	call when document ready. 



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2458 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-03-03 16:25:39 +00:00
mdtrooper 63ca79bf0a 2010-03-03 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_gis.php: add new parameter to function "addPath" the
	$lastPosition for paint the line to last position that this position is not
	in the table tgis_data_history. In function "getAgentMap" use the new
	parameter in the function "addPath".
	 
	* operation/gis_maps/render_view.php: tiny fix in the include javascript
	of google. And few stetic changes in the top menu. And add the new parameter
	to "addPath".


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2455 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-03-03 10:34:35 +00:00
mdtrooper 0c7b3d1648 2010-03-03 Miguel de Dios <miguel.dedios@artica.es>
* operation/gis_maps/render_view.php: close in the end a unclose php tag.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2454 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-03-03 09:25:10 +00:00
mdtrooper f869f56312 2010-03-02 Miguel de Dios <miguel.dedios@artica.es>
* operation/gis_maps/render_view.php: clean source code.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2448 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-03-02 15:39:50 +00:00
Pablo de la Concepción Sanz 57df567e55 2010-03-02 Pablo de la Concepción <pablo.concepcion@artica.es>
* include/functions_gis.php: Added a missing break and remove debugging 
	code.

	* operation/gis_maps/render_view.php: Added code to render Gmap type of 
	maps.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2446 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-03-02 15:24:49 +00:00
mdtrooper ee6e942096 2010-03-02 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_gis.php: add function "addParentLines", in ths function
	make a hierachy layer and call "js_refreshParentLines" for paint hierachy
	lines. In function "activateAjaxRefresh" use the function
	"js_refreshParentLines" for repaint the lines.
	
	*include/javascript/openlayers.pandora.js: add the global var
	"storeLayerNameHierachy" for save the text localiced name of Hierachy lines
	layer. Add the function "js_refreshParentLines" for paint the lines from
	parent to sons. In function "changeShowStatus" add the
	"js_refreshParentLines"

	* operation/gis_maps/render_view.php: use the function "addParentLines" for
	start the parent lines.

	* operation/agentes/gis_view.php: clean sourcecode.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2442 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-03-02 12:00:57 +00:00
mdtrooper 4c577a9cb0 2010-03-01 Miguel de Dios <miguel.dedios@artica.es>
* operation/gis_maps/ajax.php: fix the query to extract the GIS data for
	agent, in any moment in the past I dirty the query, but now it's clean, and
	now run fine the agent movement.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2441 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-03-02 10:19:09 +00:00
mdtrooper 8ae77f92d1 2010-03-01 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_gis.php: in fuction "getAgentsLayer" fix when none data
	for agents in this layer.
	
	* operation/gis_maps/render_view.php: fix link to edit map and fix the text
	of header.
	
	operation/gis_maps/index.php: use function "print_page_header".



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2437 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-03-01 11:40:07 +00:00
mdtrooper 3b6892c709 2010-02-25 Miguel de Dios <miguel.dedios@artica.es>
* ChangeLog: I did'nt upload in previous commit the changelog.

	* include/functions_gis.php: refactor the name of function "addPoint"
	to "addAgentPoint". In function "get_agent_icon_map" add new parameter
	$status for pass the status.
	
	* include/javascript/openlayers.pandora.js: add function "js_addAgentPoint"
	is same more or less "js_addPoint" and too for "js_addAgentPointExtent" and
	"js_addPointExtent".

	* operation/gis_maps/render_view.php: add the id_parent in the call of
	"addAgentPoint".
	
	* operation/gis_maps/ajax.php: clean source code and add the id_parent to
	return json for each agent.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2423 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-02-25 17:27:55 +00:00
mdtrooper 4ac27420e1 2010-02-24 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_gis.php: change the setup params "maxExtent",
	"maxResolution", "numZoomLevels" from map to baselayer. Add new function
	"getAgentsLayer" to get agent info of agents in layer, but only agents not
	in group in layer. 
	
	* operation/gis_maps/render_view.php: use new function "getAgentsLayer".

	* operation/gis_maps/ajax.php: fix the extract agent gis info, and clean
	source code.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2418 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-02-25 12:46:47 +00:00
mdtrooper 1a95c79454 2010-02-24 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_gis.php: in function "printMap" add the posibility to
	show the Static_Image base layer (WIP because it'snt show the icons), in
	function "getAgentMap" pass the status in the feature.
	
	* include/javascript/openlayers.pandora.js: in the function "js_printMap"
	add the posibility to show the Static_Image base layer (WIP).
	
	* operation/gis_maps/render_view.php: clean source code for the part of
	baselayers and add the code for Static Image baselayer.
	
	* godmode/setup/gis_step_2.php: clean source code uninitialize vars, add
	the preview static image var (WIP because it'snt show the icons).



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2414 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-02-24 13:42:01 +00:00
mdtrooper 7db3cb7f1c 2010-02-24 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_gis.php: fix the refresh time in function
	"activateAjaxRefresh", in functions "activateAjaxRefresh" and "addPoint"
	 add status agent.
	 
	* include/javascript/openlayers.pandora.js: add function "changeShowStatus"
	for change show icons by status, in function "changeRefreshTime" add reset
	timer, in function "js_addPoint" and "js_addPointExtent" add the state and
	hide if it's necesary.
	
	* operation/gis_maps/render_view.php: change the style of page, and add
	controls for hide agent icons by state.

	* operation/gis_maps/ajax.php: add the option "get_map_connection_data" in
	switch for get map connection data.

	* godmode/gis_maps/configure_gis_map.php: start to develop the preview map
	in editor.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2412 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-02-24 11:49:03 +00:00
Pablo de la Concepción Sanz f5fcd58481 2010-02-24 Pablo de la Concepción <pablo.concepcion@artica.es>
* pandora_console/operation/gis_maps/render_view.php: Changed PanZoom
    to PanZoomBar in the map.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2411 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-02-24 10:58:07 +00:00
mdtrooper 132ab90b41 2010-02-23 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_gis.php: in function "activateAjaxRefresh" add the
	posibility to change refresh time in execution time.
	
	* include/functions_ui.php: add in the "print_page_header" the feature to
	pass a array of buttons/items.

	* include/javascript/openlayers.pandora.js: add the function
	"changeRefreshTime" for change the refresh time.

	* operation/gis_maps/render_view.php: change the top of page for to
	adapt the new header, and add refresh control.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2408 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-02-23 16:36:24 +00:00
mdtrooper 78a81f5234 2010-02-22 Sancho Lerena <slerena@artica.es>
* include/functions_gis.php: change the function "activateAjaxRefresh" for
	refresh also the agent maps, and in the function "getAgentMap" show icon
	with status the agent maps.
	* operation/gis_maps/ajax.php: in the switch option "get_new_positions"
	return GIS data for agent maps, in the "point_agent_info" and
	"point_path_info" option change for new tables.
	* operation/agentes/gis_view.php: add the ajax moving agent and click
	bubble info.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2405 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-02-23 12:12:41 +00:00
mdtrooper f5377c5122 2010-02-22 Miguel de Dios <miguel.dedios@artica.es>
* operation/gis_maps/ajax.php: fix bug that pass wrong var to search
	status in function "get_agent_status".



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2399 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-02-22 18:09:56 +00:00
mdtrooper aa95edc888 2010-02-22 Miguel de Dios <miguel.dedios@artica.es>
* images/groups_small/*.ok.png, images/groups_small/*.default.png,
	images/groups_small/*.bad.png, images/groups_small/*.warning.png: add the
	group images for diferent status, it's used in the GIS map.
	
	* godmode/agentes/agent_manager.php: change for new form to name the icons
	with status.
	
	* include/functions_gis.php: clean source code in function "addPoint",
	rewrite the function "get_agent_icon_map" for used icons with state for
	group, change some parts of source code in the function "getArrayListIcons"
	for new form to name the icons.
	
	* images/gis_map/icons/*.png: change some icons.
	
	* operation/agentes/estado_generalagente.php: show message when there isn't
	the GIS data.
	
	* operation/gis_maps/ajax.php: change the source code and db query to
	return the GIS data for return default position for agent without GIS data.
	
	* operation/gis_maps/render_view.php: show agents without GIS data.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2396 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-02-22 16:13:12 +00:00
mdtrooper 72bc9ecb30 2010-02-19 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_gis.php: adapt to new tables.
	
	* include/javascript/openlayers.pandora.js
	
	* operation/gis_maps/render_view.php: adapt to new tables.
	
	* operation/gis_maps/ajax.php: adapt to new tables.
	
	* operation/agentes/gis_view.php: clean source code.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2386 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-02-19 12:26:54 +00:00
mdtrooper ced57d7aa1 2010-02-18 Miguel de Dios <miguel.dedios@artica.es>
* operation/gis_maps/render_view.php: change to use new tables.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2378 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-02-18 17:32:14 +00:00
mdtrooper 2e1410f8dd 2010-02-17 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_gis.php: add the parameter id layer in the function
	"makeLayer" for add the id layer (id of db) in the layer. Fill in the
	sourcecode  in the function "activateAjaxRefresh" that now show new
	agents in the map in real time and add make changes in this function.
	 
	* operation/gis_maps/render_view.php: use the new parameter in the call
	of function "makeLayer".

	* operation/gis_maps/ajax.php: add code to return new positions (and name
	and icon) when the ask the positions in "activateAjaxRefresh".



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2373 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-02-17 17:27:25 +00:00
mdtrooper 23af6b04ff 2010-02-15 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_gis.php: add the function "getMapConnection" get the row
	of connection for id connection, "updateMap" function update the all data in
	the DB, "validateMapData" function validate the map data previous update or
	save in the database and if it's invalid, write the css code for set colors
	and other styles, "getMapData" return all data about map for id map,
	"addConectionMapsInForm" tranlate the map connection array to html code and
	javascript for to write in the form when edit, "addLayerList" translate the
	layer array to html code and javascript for write in the form when edit.  
	
	* operation/gis_maps/render_view.php: fix the link to edit map.
	
	* godmode/gis_maps/configure_gis_map.php: change many parts of the source
	code for add the method the edit in the form and add more usability
	to form.
	
	* godmode/gis_maps/index.php: fix the links to edit and view map.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2370 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-02-16 15:28:07 +00:00
mdtrooper 3e74b2a983 2010-02-10 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_gis.php: in function "saveMap" now save the default
	connection.
	
	* operation/gis_maps/ajax.php: add option "get_data_conexion" for get by
	ajax the data connection when pass id_connection.
	
	* godmode/gis_maps/configure_gis_map.php: now you can set the default
	connection and too load the data by default for each connection.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2344 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-02-10 18:27:24 +00:00
mdtrooper e9cfd7729f 2010-02-09 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_gis.php: clean source code, and extract the javascript
	code to openlayers.pandora.js.
	
	* include/javascript/openlayers.pandora.js: new file, have a source code of
	gis in javascript.
	
	* operation/gis_maps/render_view.php, operation/gis_maps/index.php,
	operation/agentes/gis_view.php, godmode/agentes/agent_manager.php,
	godmode/setup/gis.php, godmode/gis_maps/configure_gis_map.php,
	godmode/gis_maps/index.php: add the require javascript to 
	"openlayers.pandora.js".

	* godmode/setup/gis_step_2.php: add the source code to improve usability,
	now can set with the mouse points of center and default position for agents
	without gis data.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2335 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-02-09 17:06:25 +00:00
mdtrooper 3246cd748a 2010-02-04 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_gis.php: add javascript function "isInt" for test int
	values, rename some javascript functions for to avoid typing mistakes with
	similar name functions in PHP. Add the function "activateAjaxRefresh" and
	"getArrayListIcons".
	
	* operation/gis_maps/ajax.php: add new operation "get_new_positions" for
	ajax refresh the points.
	
	* operation/gis_maps/render_view.php: change the source code for to use new
	functions as "activateAjaxRefresh" for example.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2330 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-02-04 10:34:30 +00:00
Pablo de la Concepción Sanz efe71d5c71 2010-01-29 Pablo de la Concepción <pablo.concepcion@artica.es>
* operation/gis_maps/render_view.php: Fixed call to get_agent_names to
	get the names in the same case as they are in the DB.

	* operation/agentes/gis_view.php: Changed size of the map to be relative

	* include/functions_gis.php: Fixed the call to addPoint in getAgentMap
	to use the new parameters.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2322 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-01-29 15:47:40 +00:00
mdtrooper afa846c554 2010-01-27 Miguel de Dios <miguel.dedios@artica.es>
* operation/gis_maps/render_view.php: add the check if there aren't any
	connection to map.
	
	* operation/menu.php: change parameter "id" to "id_map". 



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2318 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-01-28 18:15:16 +00:00
mdtrooper 676532f53c 2010-01-27 Miguel de Dios <miguel.dedios@artica.es>
* operation/gis_maps/ajax.php: clean source code, erased comment lines.
	
	* include/functions_gis.php, godmode/gis_maps/configure_gis_map.php: clean
	source, change the name of saveMap2 to saveMap.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2316 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-01-28 14:44:57 +00:00
Pablo de la Concepción Sanz 010cd0f132 2010-01-27 Pablo de la Concepción <pablo.concepcion@artica.es>
* include/functions_gis.php: Modiffied addPoint and addPointExtent to 
	receive more parmeters so it's possible to use any kind of point.
	Modified comments on saveMap2

	* operation/gis_maps/render_view.php: Used map_id instead if id when 
	the parameter passed in the url is a map id.
	Fixed to work with the new function getMapConf.
	Improved "pure" view. Still some things are hardcoded and needs improvement

	* operation/gis_maps/ajax.php: Modified to suppor calls to get info of 
	different kind of points. Removed hardcoded data.

	* operation/gis_maps/index.php:  Used map_id instead if id when
	the parameter passed in the url is a map id.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2315 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-01-27 19:52:53 +00:00
mdtrooper 3b68fd57fe 2010-01-18 Miguel de Dios <miguel.dedios@artica.es>
* include/styles/menu.css, godmode/gis_maps, godmode/menu.php,
	godmode/gis_maps/configure_gis_map.php, godmode/gis_maps/index.php: add the
	page to manipulate the GIS maps and add the page to create (and edit not at
	the moment) the GIS maps.
	* operation/gis_maps/render_view.php: small changes in the develop of
	render, add events and popups.
	* include/functions_gis.php: add code for respond to events, add function
	"saveMap" to save a map.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2294 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-01-21 17:08:58 +00:00
mdtrooper 1a216ccec3 2010-01-18 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_gis.php, operation/gis_maps/ajax.php: code for GIS maps,
	now show correctly the path points and start to show the popup for this
	points.
	* include/javascript/OpenLayers/lib/Gears/gears_init.js,
	include/javascript/OpenLayers/lib/OpenLayers/Format/ArcXML/Features.js:
	some files of OpenLayers that I erased in the previous clean.
	* images/spinner.gif: image for ajax loading.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2287 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-01-19 15:49:34 +00:00
mdtrooper 8641d8fc48 2010-01-18 Miguel de Dios <miguel.dedios@artica.es>
* operation/visual_console/render_view.php: fix style, add a white space.
	
	* include/styles/menu.css, include/styles/pandora.css: add styles for
	GIS maps.
	* operation/gis_maps/*, operation/menu.php, images/gis_map,
	godmode/setup/gis.php, godmode/menu.php: add first version of GIS maps.
	


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2280 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-01-18 14:24:25 +00:00