diff --git a/.idea/misc.xml b/.idea/misc.xml
index af9751c..04fd990 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,19 +3,16 @@
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
       <map>
-        <entry key="..\:/Users/student/StudioProjects/NemophilaClient/app/src/main/res/layout/activity_login.xml" value="0.25" />
         <entry key="..\:/Users/Student/StudioProjects/NemophilaClient/app/src/main/res/drawable-v24/ic_launcher_foreground.xml" value="0.1425" />
         <entry key="..\:/Users/Student/StudioProjects/NemophilaClient/app/src/main/res/drawable/ic_baseline_my_location_24.xml" value="0.1" />
         <entry key="..\:/Users/Student/StudioProjects/NemophilaClient/app/src/main/res/drawable/ic_launcher_background.xml" value="0.1425" />
         <entry key="..\:/Users/Student/StudioProjects/NemophilaClient/app/src/main/res/layout/activity_gps.xml" value="0.13095238095238096" />
         <entry key="..\:/Users/Student/StudioProjects/NemophilaClient/app/src/main/res/layout/activity_login.xml" value="0.13221884498480244" />
         <entry key="..\:/Users/Student/StudioProjects/NemophilaClient/app/src/main/res/layout/activity_main.xml" value="0.25" />
+        <entry key="..\:/Users/Student/StudioProjects/NemophilaClient/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml" value="0.226" />
         <entry key="..\:/Users/student/StudioProjects/NemophilaClient/app/src/main/res/layout/activity_main.xml" value="0.228125" />
         <entry key="..\:/Users/student/StudioProjects/NemophilaClient/app/src/main/res/layout/activity_maps.xml" value="0.17074275362318841" />
-        <entry key="..\:/Users/student/StudioProjects/NemophilaClient/app/src/main/res/layout/activity_mypage.xml" value="0.22135416666666666" />
         <entry key="..\:/Users/student/StudioProjects/NemophilaClient/app/src/main/res/layout/activity_post.xml" value="0.33" />
-        <entry key="..\:/Users/student/StudioProjects/NemophilaClient/app/src/main/res/layout/activity_shop.xml" value="0.25052083333333336" />
-        <entry key="..\:/Users/student/StudioProjects/NemophilaClient/app/src/main/res/layout/activity_sign_up.xml" value="0.33" />
       </map>
     </option>
   </component>
diff --git a/app/build.gradle b/app/build.gradle
index 2570292..3e9f984 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -41,6 +41,7 @@
     implementation 'com.google.android.material:material:1.6.1'
     implementation 'com.google.android.gms:play-services-maps:17.0.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'com.google.firebase:firebase-firestore:23.0.2'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 71afc68..c421826 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -50,11 +50,11 @@
             android:name=".LoginActivity"
             android:exported="true"
             android:label="@string/title_activity_login">
-             <intent-filter>
-             <action android:name="android.intent.action.MAIN" />
+<!--             <intent-filter>-->
+<!--             <action android:name="android.intent.action.MAIN" />-->
 
-             <category android:name="android.intent.category.LAUNCHER" />
-             </intent-filter>
+<!--             <category android:name="android.intent.category.LAUNCHER" />-->
+<!--             </intent-filter>-->
         </activity>
         <activity
             android:name=".RequestedActivity"
@@ -84,11 +84,11 @@
             android:name=".MainActivity"
             android:exported="true"
             android:label="@string/title_activity_maps">
-<!--            <intent-filter>-->
-<!--                <action android:name="android.intent.action.MAIN" />-->
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
 
-<!--                <category android:name="android.intent.category.LAUNCHER" />-->
-<!--            </intent-filter>-->
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
         </activity>
 
         <activity
diff --git a/app/src/main/java/com/example/nemophila/MainActivity.java b/app/src/main/java/com/example/nemophila/MainActivity.java
index d287f6a..93d7107 100644
--- a/app/src/main/java/com/example/nemophila/MainActivity.java
+++ b/app/src/main/java/com/example/nemophila/MainActivity.java
@@ -1,22 +1,21 @@
 package com.example.nemophila;
 
-import androidx.annotation.NonNull;
 import androidx.core.content.res.ResourcesCompat;
 import androidx.fragment.app.FragmentActivity;
 
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
 
-import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
+import android.graphics.Point;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.widget.Toast;
 import android.annotation.SuppressLint;
-import android.net.Uri;
-import android.os.Bundle;
 import android.content.pm.PackageManager;
 import android.location.Location;
 import android.location.LocationListener;
@@ -25,16 +24,16 @@
 import android.content.Intent;
 import android.provider.Settings;
 import android.util.Log;
-import android.widget.Toast;
 import android.Manifest;
 
-import com.google.android.gms.maps.CameraUpdate;
 import com.google.android.gms.maps.CameraUpdateFactory;
 import com.google.android.gms.maps.GoogleMap;
+import com.google.android.gms.maps.MapView;
 import com.google.android.gms.maps.OnMapReadyCallback;
 import com.google.android.gms.maps.SupportMapFragment;
 import com.google.android.gms.maps.model.BitmapDescriptor;
 import com.google.android.gms.maps.model.BitmapDescriptorFactory;
+import com.google.android.gms.maps.model.CameraPosition;
 import com.google.android.gms.maps.model.GroundOverlay;
 import com.google.android.gms.maps.model.GroundOverlayOptions;
 import com.google.android.gms.maps.model.LatLng;
@@ -42,8 +41,9 @@
 import com.google.android.gms.maps.model.Marker;
 import com.google.android.gms.maps.model.MarkerOptions;
 import com.example.nemophila.databinding.ActivityMainBinding;
+import com.google.firebase.firestore.GeoPoint;
 
-import java.util.Locale;
+import java.util.Map;
 
 public class MainActivity extends FragmentActivity implements OnMapReadyCallback,LocationListener  {
 
@@ -51,7 +51,9 @@
     private ActivityMainBinding binding;
     private LatLng latlng;
     private LatLng latlng2;
-    private LatLng location;
+
+    MapView mapV = null;
+    //MapController mc = null;
 
     LocationManager locationManager;
 
@@ -59,7 +61,7 @@
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         //現在地アイコンの取得
-        Drawable ic_current = ResourcesCompat.getDrawable(getResources(),R.drawable.ic_current_location,null);
+        //Drawable ic_current = ResourcesCompat.getDrawable(getResources(),R.drawable.ic_current_location,null);
 
         binding = ActivityMainBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
@@ -80,28 +82,10 @@
                 .findFragmentById(R.id.map);
         assert mapFragment != null;
         mapFragment.getMapAsync(this);
+
+
     }
 
-    /*
-    ここからマップに関する操作
-     */
-    /*
-    @Override
-    public void onMapReady(GoogleMap googleMap) {
-        mMap = googleMap;
-
-        //マーカー（ピン）の登録・表示方法（例）
-        LatLng ntlab = new LatLng(34.73, 135.26);
-        mMap.addMarker(new MarkerOptions().position(ntlab).title("Marker in ntlab"));
-        mMap.moveCamera(CameraUpdateFactory.newLatLng(ntlab));
-
-        //カメラの移動処理方法（例）
-        CameraUpdate cUpdate = CameraUpdateFactory.newLatLngZoom(
-                new LatLng(34.73, 135.26), 15);
-        mMap.moveCamera(cUpdate);
-    }
-    */
-
     @Override
     public void onMapReady(GoogleMap googleMap) {
         mMap = googleMap;
@@ -110,14 +94,14 @@
         double latitude = 34.7308032;
         double longitude = 135.2630272;
 
-        latlng = new LatLng(latitude, longitude);
         //テスト用
+        latlng = new LatLng(latitude, longitude);
         latlng2 = new LatLng(34.74, 135.26);
 
-        // 標準のマーカー
+        //標準のマーカー(店用のピン)
         setMarker(latitude, longitude);
 
-        // アイコン画像をマーカーに設定
+        //アイコン画像をマーカーに設定
         //画像関連がわかっていないのでパス
         //setIcon(latitude, longitude);
 
@@ -214,31 +198,30 @@
     }
 
     private void setIcon(double latitude, double longitude){
-        Drawable ic_current = ResourcesCompat.getDrawable(getResources(),R.drawable.icon,null);
+        Drawable ic_current = ResourcesCompat.getDrawable(getResources(),R.drawable.icon_current,null);
 
         //LatLng current_location = new LatLng(34.73080,135.2630272);
         LatLng current_location = new LatLng(latitude,longitude);
         //mMap.addMarker(new MarkerOptions().position(current_location).icon(BitmapDescriptorFactory.fromResource(R.drawable.icon)));
         // マップに貼り付ける BitmapDescriptor生成
-        // 画像は自分で適当に用意します。ここではmipmapから持ってきましたが
-        BitmapDescriptor descriptor = BitmapDescriptorFactory.fromResource(R.drawable.icon);
+        BitmapDescriptor descriptor = BitmapDescriptorFactory.fromResource(R.drawable.icon_current);
         //Drawable ic_current = ResourcesCompat.getDrawable(getResources(),R.drawable.ic_current_location,null);
 
         // 貼り付設定
         GroundOverlayOptions overlayOptions = new GroundOverlayOptions();
         overlayOptions.image(descriptor);
 
-        //　public GroundOverlayOptions anchor (float u, float v)
+        //public GroundOverlayOptions anchor (float u, float v)
         // (0,0):top-left, (0,1):bottom-left, (1,0):top-right, (1,1):bottom-right
         overlayOptions.anchor(0.5f, 0.5f);
 
         // 張り付け画像の大きさ メートル単位
         // public GroundOverlayOptions	position(LatLng location, float width, float height)
-        overlayOptions.position(current_location, 300f, 300f);
+        overlayOptions.position(current_location, 200f, 200f);
 
         // マップに貼り付け・アルファを設定
         GroundOverlay overlay = mMap.addGroundOverlay(overlayOptions);
-        // ズーム
+        // カメラを移動
         zoomMap(latitude, longitude);
 
         // 透明度
@@ -246,6 +229,80 @@
         overlay.setTransparency(0.0F);
     }
 
+    protected void setCurrent(Location location){
+        if(location == null){
+            return;
+        }
+        // LocationからGeoPointへ変換
+        Double latitude = location.getLatitude() * 1E6;
+        Double longitude = location.getLongitude() * 1E6;
+        GeoPoint geoPoint = new GeoPoint(latitude.intValue(),
+                longitude.intValue());
+        /*
+        //地図の中央に設定
+        mc.setCenter(geoPoint);
+        */
+
+        /*
+        // 目標値の座標にイメージを描画
+        if( currentLocationOverlay == null){
+            // 初回はOverlayを作成
+            BitmapDescriptor descriptor = BitmapDescriptorFactory.fromResource(R.drawable.icon_current);
+            currentLocationOverlay = new CurrentLocationOverlay(bmp);
+            currentLocationOverlay.setGeoPoint(geoPoint);
+            // Overlayの追加
+            mapV.getOverlays().add(currentLocationOverlay);
+        }
+        else{
+            // 2回目以降はOverlayを再利用
+            currentLocationOverlay.setGeoPoint(geoPoint);
+            // 無効にして再描画
+            mapV.invalidate();
+        }
+*/
+
+    }
+
+    /*
+    public class CurrentLocationOverlay extends Overlay {
+        // 描画するイメージ
+        private Bitmap bmp;
+        // 描画する座標
+        private GeoPoint geoPoint;
+        public CurrentLocationOverlay(Bitmap bmp) {
+            this.bmp = bmp;
+        }
+        public GeoPoint getGeoPoint() {
+            return geoPoint;
+        }
+        public void setGeoPoint(GeoPoint geoPoint) {
+            this.geoPoint = geoPoint;
+        }
+
+        @Override
+        public void draw(Canvas canvas, MapView mapView, boolean shadow)
+        {
+            // shadow = true,falseで2回呼び出される
+            if( !shadow){
+
+                // Mapの表示位置と座標から画面の描画位置を算出
+                Projection pro = mapView.getProjection();
+                Point p = pro.toPixels(geoPoint,null);
+
+                // 中心がくるように調整
+                int centerX = p.x - bmp.getWidth() / 2;
+                int centerY = p.y - bmp.getHeight() / 2;
+
+                // 画像の描画
+                canvas.drawBitmap(bmp, centerX, centerY, null);
+            }
+        }
+    }
+    */
+
+
+
+
     private final ActivityResultLauncher<String>
             requestPermissionLauncher = registerForActivityResult(
             new ActivityResultContracts.RequestPermission(),
@@ -260,6 +317,7 @@
                 }
             });
 
+    //現在地の取得
     @SuppressLint("MissingPermission")
     private void locationStart(){
         Log.d("debug","locationStart()");
@@ -292,6 +350,7 @@
 
         //解決しているはずの問題にエラーが起きています
         //実行はできます
+        //勝手に治りました
         locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER,
                 1000, 50, this);
 
@@ -300,6 +359,8 @@
     @Override
     public void onLocationChanged(Location location) {
         //現在地が変更されるたびに現在地アイコンを移動
+        //LatLng型で一応受け取っておく
+        latlng = new LatLng(location.getLatitude(), location.getLongitude());
 
         /*
         テスト用。現在座標を画面に表示
@@ -314,7 +375,7 @@
         String str2 = "Longitude:"+location.getLongitude();
         textView2.setText(str2);
 
-        //現在地アイコンを表示
+        //現在地アイコンを表示.このsetIcon内にzoomMap処理もあるので注意
         setIcon(location.getLatitude(),location.getLongitude());
     }
 
diff --git a/app/src/main/res/drawable/icon.jpg b/app/src/main/res/drawable/icon.jpg
deleted file mode 100644
index 6f2e35a..0000000
--- a/app/src/main/res/drawable/icon.jpg
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable/icon_current.jpg b/app/src/main/res/drawable/icon_current.jpg
new file mode 100644
index 0000000..6f2e35a
--- /dev/null
+++ b/app/src/main/res/drawable/icon_current.jpg
Binary files differ