diff --git a/app/src/main/java/com/example/nemophila/MapsFragment.java b/app/src/main/java/com/example/nemophila/MapsFragment.java
index 4f79231..fe7c601 100644
--- a/app/src/main/java/com/example/nemophila/MapsFragment.java
+++ b/app/src/main/java/com/example/nemophila/MapsFragment.java
@@ -180,36 +180,43 @@
                 //Shopの描画範囲を指定
                 shopsViewModel.setViewArea(nemophila.getCameraLongitude() + 1, nemophila.getCameraLatitude() + 1, nemophila.getCameraLongitude() - 1, nemophila.getCameraLatitude() - 1);
 
-//                Collection<Shop> shops = shopsViewModel.getPreShoplist();
-//
-//                if ( shops != null ) {
-//                    System.out.println("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA");
-//                    System.out.println(shops);
-//
-//                    Toast.makeText(getActivity(),
-//                                    String.format("フィルターを適応中"),
-//                                    Toast.LENGTH_SHORT)
-//                            .show();
-//
-//                    for (Shop shop : shops) {
-//                        //                    if ( shopsViewModel.getMarker(shop) != null) {
-//                        //                        //すでに立っているピンをフィルター掛け
-//                        //                        Marker setMaker = shopsViewModel.getMarker(shop);
-//                        //                        if (!nemophila.getSelectGenres().isEmpty()) {
-//                        //                            Toast.makeText(getActivity(),
-//                        //                                            String.format("ジャンルに該当しないピンを全て非表示にします"),
-//                        //                                            Toast.LENGTH_SHORT)
-//                        //                                    .show();
-//                        //                            setMaker.setVisible(false);
-//                        //                        }
-//                        //                        if (!nemophila.getSelectFriends().isEmpty()) {
-//                        //                            setMaker.setVisible(false);
-//                        //                        }
-//                        //                    }
-//                        //                    System.out.println("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA");
-//                        //}
-//                    }
-//                }
+                Collection<Shop> shops = shopsViewModel.getPreShoplist();
+
+                if ( shops != null ) {
+                    System.out.println("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA");
+                    System.out.println(shops);
+
+                    Toast.makeText(getActivity(),
+                                    String.format("フィルターを適応中"),
+                                    Toast.LENGTH_SHORT)
+                            .show();
+
+                    for (Shop shop : shops) {
+                        if ( shopsViewModel.getMarker(shop) != null) {
+                            //すでに立っているピンをフィルター掛け
+                            Marker setMaker = shopsViewModel.getMarker(shop);
+                            if (!nemophila.getSelectGenres().isEmpty()) {
+                                Toast.makeText(getActivity(),
+                                                String.format("ジャンルに該当しないピンを全て非表示にします"),
+                                                Toast.LENGTH_SHORT)
+                                        .show();
+                                setMaker.setVisible(false);
+                            } else {
+                                Toast.makeText(getActivity(),
+                                                String.format("ジャンルに該当するピンを全て表示にします"),
+                                                Toast.LENGTH_SHORT)
+                                        .show();
+                                setMaker.setVisible(true);
+
+                            }
+//                            if (!nemophila.getSelectFriends().isEmpty()) {
+//                                setMaker.setVisible(false);
+//                            }
+
+                            System.out.println("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA");
+                        }
+                    }
+                }
             });